Remember thread's task when sampling use it when filtering

runtime/vm/profiler.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/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 289 matching lines @@
       (time_extent_micros_ == -1)) {
     // No time filter passed in, always pass.
     return true;
   }
   const int64_t timestamp = sample->timestamp();
   int64_t delta = timestamp - time_origin_micros_;
   return (delta >= 0) && (delta <= time_extent_micros_);
 }
 
 
+bool SampleFilter::TaskFilterSample(Sample* sample) {
+  const intptr_t task = static_cast<intptr_t>(sample->thread_task());
+  return (task & thread_task_mask_) != 0;
+}
+
+
 ClearProfileVisitor::ClearProfileVisitor(Isolate* isolate)
     : SampleVisitor(isolate) {
 }
 
 
 void ClearProfileVisitor::VisitSample(Sample* sample) {
   sample->Clear();
 }
 
 
@@ skipping 517 matching lines @@
   // When running in the simulator, the runtime entry function address
   // (stored as the vm tag) is the address of a redirect function.
   // Attempt to find the real runtime entry function address and use that.
   uword redirect_vm_tag = Simulator::FunctionForRedirect(vm_tag);
   if (redirect_vm_tag != 0) {
     vm_tag = redirect_vm_tag;
   }
 #endif
   sample->set_vm_tag(vm_tag);
   sample->set_user_tag(isolate->user_tag());
-  // TODO(rmacnak): Consider tracking the current Task kind so the profiler
-  // can say the program spent x% of cpu time in the main thread, GC,
-  // background compilation, etc.
-  sample->set_is_mutator_thread(thread->IsMutatorThread());
+  sample->set_thread_task(thread->task_kind());
   return sample;
 }
 
 
 static bool CheckIsolate(Isolate* isolate) {
   if ((isolate == NULL) || (Dart::vm_isolate() == NULL)) {
     // No isolate.
     return false;
   }
   return isolate != Dart::vm_isolate();
@@ skipping 121 matching lines @@
   }
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     return;
   }
 
   if (!CheckIsolate(isolate)) {
     return;
   }
 
+  // Thread is not doing VM work.
+  if (thread->task_kind() == Thread::kUnknownTask) {
+    return;
+  }
+
   uword stack_lower = 0;
   uword stack_upper = 0;
   if (!GetAndValidateIsolateStackBounds(thread,
                                         fp,
                                         sp,
                                         &stack_lower,
                                         &stack_upper)) {
     // Could not get stack boundary.
     return;
   }
@@ skipping 214 matching lines @@
       continue;
     }
     if (sample->At(0) == 0) {
       // No frames.
       continue;
     }
     if (!filter->TimeFilterSample(sample)) {
       // Did not pass time filter.
       continue;
     }
+    if (!filter->TaskFilterSample(sample)) {
+      // Did not pass task filter.
+      continue;
+    }
     if (!filter->FilterSample(sample)) {
       // Did not pass filter.
       continue;
     }
     buffer->Add(BuildProcessedSample(sample, buffer->code_lookup_table()));
   }
   return buffer;
 }
 
 
@@ skipping 144 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart