Preparation for moving reusable handles to thread and more cleanups: isolate -> thread based handle…

runtime/vm/debugger.cc

 // Copyright (c) 2012, 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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 1216 matching lines @@
 }
 
 
 RawObject* RemoteObjectCache::GetObj(intptr_t obj_id) const {
   ASSERT(IsValidId(obj_id));
   return objs_->At(obj_id);
 }
 
 
 Debugger::Debugger()
-    : isolate_(NULL),
+    : thread_(NULL),
+      isolate_(NULL),
       isolate_id_(ILLEGAL_ISOLATE_ID),
       initialized_(false),
       next_id_(1),
       latent_locations_(NULL),
       breakpoint_locations_(NULL),
       code_breakpoints_(NULL),
       resume_action_(kContinue),
       ignore_breakpoints_(false),
       pause_event_(NULL),
       obj_cache_(NULL),
@@ skipping 701 matching lines @@
       // Note: if this class has been parsed and finalized already,
       // we need to check the functions of this class even if
       // it is defined in a differenct 'script'. There could
       // be mixin functions from the given script in this class.
       // However, if this class is not parsed yet (not finalized),
       // we can ignore it and avoid the side effect of parsing it.
       if ((cls.script() != script.raw()) && !cls.is_finalized()) {
         continue;
       }
       // Parse class definition if not done yet.
-      error = cls.EnsureIsFinalized(isolate_);
+      error = cls.EnsureIsFinalized(thread_);
       if (!error.IsNull()) {
         // Ignore functions in this class.
         // TODO(hausner): Should we propagate this error? How?
         // EnsureIsFinalized only returns an error object if there
         // is no longjump base on the stack.
         continue;
       }
       functions = cls.functions();
       if (!functions.IsNull()) {
         const intptr_t num_functions = functions.Length();
@@ skipping 790 matching lines @@
   // We are in the native call to Debugger_breakHere or Debugger_breakHereIf,
   // the developer gets a better experience by not seeing this call. To
   // accomplish this, we continue execution until the call exits (step out).
   SetStepOut();
   HandleSteppingRequest(stack_trace_);
 
   stack_trace_ = NULL;
 }
 
 
-void Debugger::Initialize(Isolate* isolate) {
+void Debugger::Initialize(Thread* thread) {
   if (initialized_) {
     return;
   }
-  isolate_ = isolate;
+  thread_ = thread;
+  isolate_ = thread->isolate();
 
   // Use the isolate's control port as the isolate_id for debugging.
   // This port will be used as a unique ID to represent the isolate in the
   // debugger wire protocol messages.
-  isolate_id_ = isolate->main_port();
+  isolate_id_ = isolate_->main_port();
   initialized_ = true;
 }
 
 
 void Debugger::NotifyIsolateCreated() {
   // Signal isolate creation event.
   if (!ServiceIsolate::IsServiceIsolateDescendant(isolate_)) {
     SignalIsolateEvent(DebuggerEvent::kIsolateCreated);
   }
 }
@@ skipping 431 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart