Merge up to 8597 to experimental/gc from the bleeding edge.

src/d8-debug.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 141 matching lines @@
     if (text_str.length() > 0) {
       printf("%s\n", *text_str);
     }
     running =
         response_details->Get(String::New("running"))->ToBoolean()->Value();
   }
 }
 
 
 void RunRemoteDebugger(int port) {
-  RemoteDebugger debugger(i::Isolate::Current(), port);
+  RemoteDebugger debugger(port);
   debugger.Run();
 }
 
 
 void RemoteDebugger::Run() {
   bool ok;
 
   // Make sure that socket support is initialized.
   ok = i::Socket::Setup();
   if (!ok) {
     printf("Unable to initialize socket support %d\n", i::Socket::LastError());
     return;
   }
 
   // Connect to the debugger agent.
   conn_ = i::OS::CreateSocket();
   static const int kPortStrSize = 6;
   char port_str[kPortStrSize];
   i::OS::SNPrintF(i::Vector<char>(port_str, kPortStrSize), "%d", port_);
   ok = conn_->Connect("localhost", port_str);
   if (!ok) {
     printf("Unable to connect to debug agent %d\n", i::Socket::LastError());
     return;
   }
 
   // Start the receiver thread.
-  ReceiverThread receiver(isolate_, this);
+  ReceiverThread receiver(this);
   receiver.Start();
 
   // Start the keyboard thread.
-  KeyboardThread keyboard(isolate_, this);
+  KeyboardThread keyboard(this);
   keyboard.Start();
   PrintPrompt();
 
   // Process events received from debugged VM and from the keyboard.
   bool terminate = false;
   while (!terminate) {
     event_available_->Wait();
     RemoteDebuggerEvent* event = GetEvent();
     switch (event->type()) {
       case RemoteDebuggerEvent::kMessage:
@@ skipping 61 matching lines @@
   head_ = head_->next();
   if (head_ == NULL) {
     ASSERT(tail_ == result);
     tail_ = NULL;
   }
   return result;
 }
 
 
 void RemoteDebugger::HandleMessageReceived(char* message) {
+  Locker lock;
   HandleScope scope;
 
   // Print the event details.
   TryCatch try_catch;
   Handle<Object> details =
       Shell::DebugMessageDetails(Handle<String>::Cast(String::New(message)));
   if (try_catch.HasCaught()) {
     Shell::ReportException(&try_catch);
     PrintPrompt();
     return;
   }
   String::Utf8Value str(details->Get(String::New("text")));
   if (str.length() == 0) {
     // Empty string is used to signal not to process this event.
     return;
   }
   if (*str != NULL) {
     printf("%s\n", *str);
   } else {
     printf("???\n");
   }
 
   bool is_running = details->Get(String::New("running"))->ToBoolean()->Value();
   PrintPrompt(is_running);
 }
 
 
 void RemoteDebugger::HandleKeyboardCommand(char* command) {
+  Locker lock;
   HandleScope scope;
 
   // Convert the debugger command to a JSON debugger request.
   TryCatch try_catch;
   Handle<Value> request =
       Shell::DebugCommandToJSONRequest(String::New(command));
   if (try_catch.HasCaught()) {
     v8::String::Utf8Value exception(try_catch.Exception());
     const char* exception_string = Shell::ToCString(exception);
     printf("%s\n", exception_string);
@@ skipping 45 matching lines @@
     }
 
     // Pass the keyboard command to the main thread.
     remote_debugger_->KeyboardCommand(
         i::SmartPointer<char>(i::StrDup(command)));
   }
 }
 
 
 }  // namespace v8