Index: runtime/bin/process_android.cc |
=================================================================== |
--- runtime/bin/process_android.cc (revision 39229) |
+++ runtime/bin/process_android.cc (working copy) |
@@ -105,12 +105,12 @@ |
static ProcessInfo* active_processes_; |
// Mutex protecting all accesses to the linked list of active |
// processes. |
- static dart::Mutex* mutex_; |
+ static Mutex* mutex_; |
}; |
ProcessInfo* ProcessInfoList::active_processes_ = NULL; |
-dart::Mutex* ProcessInfoList::mutex_ = new dart::Mutex(); |
+Mutex* ProcessInfoList::mutex_ = new Mutex(); |
// The exit code handler sets up a separate thread which waits for child |
@@ -133,7 +133,7 @@ |
} |
// Start thread that handles process exits when wait returns. |
- int result = dart::Thread::Start(ExitCodeHandlerEntry, 0); |
+ int result = Thread::Start(ExitCodeHandlerEntry, 0); |
if (result != 0) { |
FATAL1("Failed to start exit code handler worker thread %d", result); |
} |
@@ -160,7 +160,7 @@ |
monitor_->Notify(); |
while (!terminate_done_) { |
- monitor_->Wait(dart::Monitor::kNoTimeout); |
+ monitor_->Wait(Monitor::kNoTimeout); |
} |
} |
@@ -174,7 +174,7 @@ |
{ |
MonitorLocker locker(monitor_); |
while (running_ && process_count_ == 0) { |
- monitor_->Wait(dart::Monitor::kNoTimeout); |
+ monitor_->Wait(Monitor::kNoTimeout); |
} |
if (!running_) { |
terminate_done_ = true; |
@@ -220,14 +220,14 @@ |
static bool terminate_done_; |
static int process_count_; |
static bool running_; |
- static dart::Monitor* monitor_; |
+ static Monitor* monitor_; |
}; |
bool ExitCodeHandler::running_ = false; |
int ExitCodeHandler::process_count_ = 0; |
bool ExitCodeHandler::terminate_done_ = false; |
-dart::Monitor* ExitCodeHandler::monitor_ = new dart::Monitor(); |
+Monitor* ExitCodeHandler::monitor_ = new Monitor(); |
static void SetChildOsErrorMessage(char** os_error_message) { |