Migrate logging infrastructure Isolate->Thread

runtime/vm/isolate.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 "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "vm/code_observers.h"
@@ skipping 681 matching lines @@
       message_handler_(NULL),
       spawn_state_(NULL),
       is_runnable_(false),
       gc_prologue_callback_(NULL),
       gc_epilogue_callback_(NULL),
       defer_finalization_count_(0),
       deopt_context_(NULL),
       edge_counter_increment_size_(-1),
       compiler_stats_(NULL),
       is_service_isolate_(false),
       log_(new class Log()),

[Ivan Posva, 2015/09/08 21:22:21]

Why does the isolate still carry around a log_ after this change?

[koda, 2015/09/09 00:26:57]

Removed.

       stacktrace_(NULL),
       stack_frame_index_(-1),
       last_allocationprofile_accumulator_reset_timestamp_(0),
       last_allocationprofile_gc_timestamp_(0),
       object_id_ring_(NULL),
       trace_buffer_(NULL),
       profiler_data_(NULL),
       tag_table_(GrowableObjectArray::null()),
       current_tag_(UserTag::null()),
       default_tag_(UserTag::null()),
@@ skipping 187 matching lines @@
     name_ = strdup(name_prefix);
     return;
   }
   const char* kFormat = "%s-%lld";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, name_prefix, main_port()) + 1;
   name_ = reinterpret_cast<char*>(malloc(len));
   OS::SNPrint(name_, len, kFormat, name_prefix, main_port());
 }
 
 
-Log* Isolate::Log() const {
+bool Isolate::ShouldLog() const {

[Ivan Posva, 2015/09/08 21:22:21]

We might want to move this functionality into the Log class instead.

[koda, 2015/09/09 00:26:57]

Done.

   if (FLAG_isolate_log_filter == NULL) {
     if (is_service_isolate_) {
       // By default, do not log for the service isolate.
-      return Log::NoOpLog();
+      return false;
     }
-    return log_;
+    return true;
   }
   ASSERT(name_ != NULL);
   if (strstr(name_, FLAG_isolate_log_filter) == NULL) {
     // Filter does not match, do not log for this isolate.
-    return Log::NoOpLog();
+    return false;
   }
-  return log_;
+  return true;
 }
 
 
 // TODO(5411455): Use flag to override default value and Validate the
 // stack size by querying OS.
 uword Isolate::GetSpecifiedStackSize() {
   ASSERT(Isolate::kStackSizeBuffer < OSThread::GetMaxStackSize());
   uword stack_size = OSThread::GetMaxStackSize() - Isolate::kStackSizeBuffer;
   return stack_size;
 }
@@ skipping 624 matching lines @@
     api_state()->prologue_weak_persistent_handles().VisitHandles(&visitor);
 
     if (FLAG_trace_isolates) {
       heap()->PrintSizes();
       megamorphic_cache_table()->PrintSizes();
       Symbols::DumpStats();
       OS::Print("[-] Stopping isolate:\n"
                 "\tisolate:    %s\n", name());
     }
     if (FLAG_print_metrics) {
-      LogBlock lb(this);
+      LogBlock lb(thread);
       ISL_Print("Printing metrics for %s\n", name());
 #define ISOLATE_METRIC_PRINT(type, variable, name, unit)                       \
   ISL_Print("%s\n", metric_##variable##_.ToString());
   ISOLATE_METRIC_LIST(ISOLATE_METRIC_PRINT);
 #undef ISOLATE_METRIC_PRINT
       ISL_Print("\n");
     }
   }
 
 #if defined(DEBUG)
@@ skipping 774 matching lines @@
                            serialized_message_, serialized_message_len_);
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(I);
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart