Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: runtime/vm/profiler_android.cc

Issue 83093004: Fix shutdown races and move signal blocking into profiler (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/profiler.cc ('k') | runtime/vm/profiler_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/profiler_android.cc
diff --git a/runtime/vm/profiler_android.cc b/runtime/vm/profiler_android.cc
index d8d67472851a6e6a086409c12d9e60f26e1b2f9e..1392739ddc066e6141c6cdd312df4b24a7f8d1e5 100644
--- a/runtime/vm/profiler_android.cc
+++ b/runtime/vm/profiler_android.cc
@@ -31,11 +31,15 @@ static void ProfileSignalAction(int signal, siginfo_t* info, void* context_) {
if (profiler_data == NULL) {
return;
}
+ if (!profiler_data->CanExpire()) {
+ // Descheduled.
+ return;
+ }
}
// Thread owns no profiler locks at this point.
// This call will acquire both ProfilerManager::monitor and the
// isolate's profiler data mutex.
- ProfilerManager::ScheduleIsolate(isolate);
+ ProfilerManager::ScheduleIsolate(isolate, true);
}
@@ -50,6 +54,12 @@ int64_t ProfilerManager::SampleAndRescheduleIsolates(int64_t current_time) {
Isolate* isolate = isolates_[i];
ScopedMutex isolate_lock(isolate->profiler_data_mutex());
IsolateProfilerData* profiler_data = isolate->profiler_data();
+ if (profiler_data == NULL) {
+ // Isolate has been shutdown for profiling.
+ RemoveIsolate(i);
+ // Remove moves the last element into i, do not increment i.
+ continue;
+ }
ASSERT(profiler_data != NULL);
if (profiler_data->ShouldSample(current_time)) {
pthread_kill(profiler_data->thread_id(), SIGPROF);
« no previous file with comments | « runtime/vm/profiler.cc ('k') | runtime/vm/profiler_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698