Migrate logging infrastructure Isolate->Thread

runtime/vm/gc_marker.cc

 // Copyright (c) 2011, 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/gc_marker.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 92 matching lines @@
         func->ptr()->entry_point_ = entry_point;
         if (FLAG_log_code_drop) {
           // NOTE: This code runs while GC is in progress and runs within
           // a NoHandleScope block. Hence it is not okay to use a regular Zone
           // or Scope handle. We use a direct stack handle so the raw pointer in
           // this handle is not traversed. The use of a handle is mainly to
           // be able to reuse the handle based code and avoid having to add
           // helper functions to the raw object interface.
           String name;
           name = func->ptr()->name_;
-          ISL_Print("Detaching code: %s\n", name.ToCString());
+          THR_Print("Detaching code: %s\n", name.ToCString());
           current_code_count++;
         }
       }
 
       code = func->ptr()->unoptimized_code_;
       if (!code->IsMarked()) {
         // If the code wasn't strongly visited through other references
         // after skipping the function's code pointer, then we disconnect the
         // code from the function.
         func->StorePointer(&(func->ptr()->unoptimized_code_), Code::null());
         if (FLAG_log_code_drop) {
           unoptimized_code_count++;
         }
       }
     }
     if (FLAG_log_code_drop) {
-      ISL_Print("  total detached current: %" Pd "\n", current_code_count);
-      ISL_Print("  total detached unoptimized: %" Pd "\n",
+      THR_Print("  total detached current: %" Pd "\n", current_code_count);
+      THR_Print("  total detached unoptimized: %" Pd "\n",
                 unoptimized_code_count);
     }
     // Clean up.
     skipped_code_functions_.Clear();
   }
 
  private:
   GrowableArray<RawFunction*> skipped_code_functions_;
 
   DISALLOW_COPY_AND_ASSIGN(SkippedCodeFunctions);
@@ skipping 551 matching lines @@
       MainSync(num_tasks);
       // Phase 2: Weak processing and follow-up marking on main thread.
       SkippedCodeFunctions* skipped_code_functions =
           collect_code ? new(zone) SkippedCodeFunctions() : NULL;
       MarkingVisitor mark(isolate, heap_, page_space, &marking_stack,
                           &delay_set, skipped_code_functions);
       IterateWeakReferences(isolate, &mark);
       MarkingWeakVisitor mark_weak;
       IterateWeakRoots(isolate, &mark_weak,
                        !visit_prologue_weak_persistent_handles);
-      // TODO(koda): Move this into Phase 3 after making ISL_Print thread-safe
-      // (used in SkippedCodeFunctions::DetachCode).
-      FinalizeResultsFrom(&mark);
       MainSync(num_tasks);
       // Phase 3: Finalize results from all markers (detach code, etc.).
+      FinalizeResultsFrom(&mark);
       MainSync(num_tasks);
       // Finalization complete and all tasks exited.
     }
     delay_set.ClearReferences();
     ProcessWeakTables(page_space);
     ProcessObjectIdTable(isolate);
   }
   Epilogue(isolate, invoke_api_callbacks);
 }
 
 }  // namespace dart