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

Unified Diff: runtime/vm/profiler.cc

Issue 2773073003: Revert "Added page to Observatory to display native memory allocation information." (Closed)
Patch Set: Created 3 years, 9 months 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.h ('k') | runtime/vm/profiler_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/profiler.cc
diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
index c41f051ef4b20c68e5bc78617928f70e3694237f..ca72be792f70fac3d49398d05bc11495e1633ee8 100644
--- a/runtime/vm/profiler.cc
+++ b/runtime/vm/profiler.cc
@@ -316,9 +316,6 @@ bool SampleFilter::TimeFilterSample(Sample* sample) {
bool SampleFilter::TaskFilterSample(Sample* sample) {
const intptr_t task = static_cast<intptr_t>(sample->thread_task());
- if (thread_task_mask_ == kNoTaskFilter) {
- return true;
- }
return (task & thread_task_mask_) != 0;
}
@@ -941,11 +938,12 @@ static Sample* SetupSampleNative(SampleBuffer* sample_buffer, ThreadId tid) {
Sample* sample = sample_buffer->ReserveSample();
sample->Init(ILLEGAL_PORT, OS::GetCurrentMonotonicMicros(), tid);
sample->set_is_native_allocation_sample(true);
+
Thread* thread = Thread::Current();
- // Note: setting thread task in order to be consistent with other samples. The
- // task kind is not used by NativeAllocationSampleFilter for filtering
- // purposes as some samples may be collected when no thread exists.
+ // TODO(bkonyi) Any samples created while a current thread doesn't exist are
+ // ignored by the NativeAllocationSampleFilter since the default task is
+ // kUnknownTask. Is this what we want to do?
if (thread != NULL) {
sample->set_thread_task(thread->task_kind());
}
@@ -1094,9 +1092,7 @@ void Profiler::SampleAllocation(Thread* thread, intptr_t cid) {
}
-Sample* Profiler::SampleNativeAllocation(intptr_t skip_count,
- uword address,
- uintptr_t allocation_size) {
+Sample* Profiler::SampleNativeAllocation(intptr_t skip_count) {
SampleBuffer* sample_buffer = Profiler::sample_buffer();
if (sample_buffer == NULL) {
return NULL;
@@ -1126,13 +1122,9 @@ Sample* Profiler::SampleNativeAllocation(intptr_t skip_count,
OSThread* os_thread = OSThread::Current();
Sample* sample = SetupSampleNative(sample_buffer, os_thread->trace_id());
- sample->set_native_allocation_address(address);
- sample->set_native_allocation_size_bytes(allocation_size);
-
ProfilerNativeStackWalker native_stack_walker(
ILLEGAL_PORT, sample, sample_buffer, stack_lower, stack_upper, pc, fp, sp,
skip_count);
-
native_stack_walker.walk();
return sample;
}
@@ -1465,8 +1457,6 @@ ProcessedSample* SampleBuffer::BuildProcessedSample(
ProcessedSample* processed_sample = new (zone) ProcessedSample();
// Copy state bits from sample.
- processed_sample->set_native_allocation_size_bytes(
- sample->native_allocation_size_bytes());
processed_sample->set_timestamp(sample->timestamp());
processed_sample->set_tid(sample->tid());
processed_sample->set_vm_tag(sample->vm_tag());
« no previous file with comments | « runtime/vm/profiler.h ('k') | runtime/vm/profiler_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698