Profiler fixes

runtime/vm/profiler_android.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/profiler.h"
@@ skipping 10 matching lines @@
   }
   Isolate* isolate = Isolate::Current();
   if (isolate == NULL) {
     return;
   }
   // Thread owns no profiler locks at this point.
   {
     // Thread owns isolate profiler data mutex.
     ScopedMutex profiler_data_lock(isolate->profiler_data_mutex());
     IsolateProfilerData* profiler_data = isolate->profiler_data();
-    if (profiler_data == NULL) {
+    if ((profiler_data == NULL) || !profiler_data->CanExpire() ||
+        (profiler_data->sample_buffer() == NULL)) {
+      // Descheduled.
       return;
     }
-    if (!profiler_data->CanExpire()) {
-      // Descheduled.
-      return;
+    if (profiler_data->thread_id() == Thread::GetCurrentThreadId()) {
+      // Still scheduled on this thread.
+      // TODO(johnmccutchan): Perform sample on Android.
     }
   }
   // 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, true);
 }
 
 
 int64_t ProfilerManager::SampleAndRescheduleIsolates(int64_t current_time) {
@@ skipping 53 matching lines @@
     int64_t current_time = OS::GetCurrentTimeMicros();
     int64_t next_sample = SampleAndRescheduleIsolates(current_time);
     lock.WaitMicros(next_sample);
   }
 }
 
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)