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

Unified Diff: runtime/vm/thread_test.cc

Issue 2609253002: Added isolate + thread high watermark tracking to Observatory (Closed)
Patch Set: Merge branch 'master' of github.com:dart-lang/sdk into resubmit Created 3 years, 11 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
Index: runtime/vm/thread_test.cc
diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc
index 44082bc53ad719373134a470d82f51631c361abd..c5073a6906ec3467c0359cabf926c3a300087254 100644
--- a/runtime/vm/thread_test.cc
+++ b/runtime/vm/thread_test.cc
@@ -320,12 +320,21 @@ TEST_CASE(ManySimpleTasksWithZones) {
isolate->PrintJSON(&stream, false);
const char* json = stream.ToCString();
+ Thread* current_thread = Thread::Current();
+ {
+ StackZone stack_zone(current_thread);
+ char* isolate_info_buf = OS::SCreate(current_thread->zone(),
+ "\"_memoryHighWatermark\":"
+ "\"%u\"",
+ isolate->memory_high_watermark());
+ EXPECT_SUBSTRING(isolate_info_buf, json);
+ }
+
// Confirm all expected entries are in the JSON output.
for (intptr_t i = 0; i < kTaskCount + 1; i++) {
Thread* thread = threads[i];
Zone* top_zone = thread->zone();
- Thread* current_thread = Thread::Current();
StackZone stack_zone(current_thread);
Zone* current_zone = current_thread->zone();
@@ -348,9 +357,11 @@ TEST_CASE(ManySimpleTasksWithZones) {
"\"type\":\"_Thread\","
"\"id\":\"threads\\/%" Pd
"\","
- "\"kind\":\"%s\"",
+ "\"kind\":\"%s\","
+ "\"_memoryHighWatermark\":\"%u\"",
OSThread::ThreadIdToIntPtr(thread->os_thread()->trace_id()),
- Thread::TaskKindToCString(thread->task_kind()));
+ Thread::TaskKindToCString(thread->task_kind()),
+ thread->memory_high_watermark());
EXPECT_SUBSTRING(thread_info_buf, json);
}

Powered by Google App Engine
This is Rietveld 408576698