Don't use statically declared Mutex in debugger

runtime/bin/dbg_message.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 "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 1035 matching lines @@
       msg.Printf("\"reason\": \"shutdown\", ");
     }
     msg.Printf("\"id\": %"Pd64" ", isolate_id);
     msg.Printf("}}");
   }
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
 
 
 DbgMsgQueue* DbgMsgQueueList::list_ = NULL;
-dart::Mutex DbgMsgQueueList::msg_queue_list_lock_;
+dart::Mutex* DbgMsgQueueList::msg_queue_list_lock_ = new dart::Mutex();
 
 
 void DbgMsgQueueList::Initialize() {
   // Setup handlers for isolate events, breakpoints, exceptions and
   // delayed breakpoints.
   Dart_SetIsolateEventHandler(IsolateEventHandler);
   Dart_SetPausedEventHandler(PausedEventHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
   Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
 }
@@ skipping 11 matching lines @@
   }
   return kInvalidCommand;
 }
 
 
 bool DbgMsgQueueList::AddIsolateMessage(Dart_IsolateId isolate_id,
                                         int32_t cmd_idx,
                                         const char* start,
                                         const char* end,
                                         int debug_fd) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
   DbgMsgQueue* queue = DbgMsgQueueList::GetIsolateMsgQueueLocked(isolate_id);
   if (queue != NULL) {
     queue->AddMessage(cmd_idx, start, end, debug_fd);
     return true;
   }
   return false;
 }
 
 
 bool DbgMsgQueueList::InterruptIsolate(Dart_IsolateId isolate_id) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
   DbgMsgQueue* queue = DbgMsgQueueList::GetIsolateMsgQueueLocked(isolate_id);
   if (queue != NULL) {
     queue->InterruptIsolate();
     return true;
   }
   return false;
 }
 
 
 DbgMsgQueue* DbgMsgQueueList::AddIsolateMsgQueue(Dart_IsolateId isolate_id) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
 
   DbgMsgQueue* queue = new DbgMsgQueue(isolate_id, list_);
   ASSERT(queue != NULL);
   list_ = queue;
   return queue;
 }
 
 
 DbgMsgQueue* DbgMsgQueueList::GetIsolateMsgQueue(Dart_IsolateId isolate_id) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
   ASSERT(Dart_GetIsolate(isolate_id) == Dart_CurrentIsolate());
   return GetIsolateMsgQueueLocked(isolate_id);
 }
 
 
 DbgMsgQueue* DbgMsgQueueList::GetIsolateMsgQueueLocked(Dart_IsolateId id) {
   if (list_ == NULL) {
     return NULL;  // No items in the list.
   }
 
   // Find message queue corresponding to isolate id.
   DbgMsgQueue* iterator = list_;
   while (iterator != NULL && iterator->isolate_id() != id) {
     iterator = iterator->next();
   }
   return iterator;
 }
 
 
 void DbgMsgQueueList::RemoveIsolateMsgQueue(Dart_IsolateId isolate_id) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
   if (list_ == NULL) {
     return;  // No items in the list.
   }
   DbgMsgQueue* queue = list_;
   if (queue->isolate_id() == isolate_id) {
     list_ = queue->next();  // Remove from list.
     delete queue;  // Delete the message queue.
     return;
   } else {
     DbgMsgQueue* iterator = queue;
     queue = queue->next();
     while (queue != NULL) {
       if (queue->isolate_id() == isolate_id) {
         iterator->set_next(queue->next());  // Remove from list.
         delete queue;  // Delete the message queue.
         return;
       }
       iterator = queue;
       queue = queue->next();
     }
   }
   UNREACHABLE();
 }
 
 
 void DbgMsgQueueList::ListIsolateIds(dart::TextBuffer* msg) {
-  MutexLocker ml(&msg_queue_list_lock_);
+  MutexLocker ml(msg_queue_list_lock_);
   if (list_ == NULL) {
     return;  // No items in the list.
   }
   DbgMsgQueue* queue = list_;
   msg->Printf("%"Pd64"", queue->isolate_id());
   queue = queue->next();
   while (queue != NULL) {
     msg->Printf(",%"Pd64"", queue->isolate_id());
     queue = queue->next();
   }
@@ skipping 67 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart