Cleanup in //runtime/bin

runtime/bin/thread_win.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 "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/thread.h"
+#include "bin/thread_win.h"
 
 #include <process.h>  // NOLINT
 
 #include "platform/assert.h"
 
 namespace dart {
 namespace bin {
 
 class ThreadStartData {
  public:
@@ skipping 31 matching lines @@
 
   return 0;
 }
 
 
 int Thread::Start(ThreadStartFunction function, uword parameter) {
   ThreadStartData* start_data = new ThreadStartData(function, parameter);
   uint32_t tid;
   uintptr_t thread = _beginthreadex(NULL, Thread::GetMaxStackSize(),
                                     ThreadEntry, start_data, 0, &tid);
-  if (thread == -1L || thread == 0) {
+  if ((thread == -1L) || (thread == 0)) {
 #ifdef DEBUG
     fprintf(stderr, "_beginthreadex error: %d (%s)\n", errno, strerror(errno));
 #endif
     return errno;
   }
 
   // Close the handle, so we don't leak the thread object.
   CloseHandle(reinterpret_cast<HANDLE>(thread));
 
   return 0;
@@ skipping 52 matching lines @@
 }
 
 
 intptr_t Thread::ThreadIdToIntPtr(ThreadId id) {
   ASSERT(sizeof(id) <= sizeof(intptr_t));
   return static_cast<intptr_t>(id);
 }
 
 
 bool Thread::Compare(ThreadId a, ThreadId b) {
-  return a == b;
+  return (a == b);
 }
 
 
 void Thread::GetThreadCpuUsage(ThreadId thread_id, int64_t* cpu_usage) {
   static const int64_t kTimeEpoc = 116444736000000000LL;
   static const int64_t kTimeScaler = 10;  // 100 ns to us.
   // Although win32 uses 64-bit integers for representing timestamps,
   // these are packed into a FILETIME structure. The FILETIME
   // structure is just a struct representing a 64-bit integer. The
   // TimeStamp union allows access to both a FILETIME and an integer
@@ skipping 58 matching lines @@
   }
 }
 
 
 bool Mutex::TryLock() {
   // Attempt to pass the semaphore but return immediately.
   DWORD result = WaitForSingleObject(data_.semaphore_, 0);
   if (result == WAIT_OBJECT_0) {
     return true;
   }
-  if (result == WAIT_ABANDONED || result == WAIT_FAILED) {
+  if ((result == WAIT_ABANDONED) || (result == WAIT_FAILED)) {
     FATAL1("Mutex try lock failed %d", GetLastError());
   }
   ASSERT(result == WAIT_TIMEOUT);
   return false;
 }
 
 
 void Mutex::Unlock() {
   BOOL result = ReleaseSemaphore(data_.semaphore_, 1, NULL);
   if (result == 0) {
@@ skipping 43 matching lines @@
   }
 }
 
 
 void MonitorData::AddWaiter(MonitorWaitData* wait_data) {
   // Add the MonitorWaitData object to the list of objects waiting for
   // this monitor.
   EnterCriticalSection(&waiters_cs_);
   if (waiters_tail_ == NULL) {
     ASSERT(waiters_head_ == NULL);
-    waiters_head_ = waiters_tail_ = wait_data;
+    waiters_head_ = wait_data;
+    waiters_tail_ = wait_data;
   } else {
     waiters_tail_->next_ = wait_data;
     waiters_tail_ = wait_data;
   }
   LeaveCriticalSection(&waiters_cs_);
 }
 
 
 void MonitorData::RemoveWaiter(MonitorWaitData* wait_data) {
   // Remove the MonitorWaitData object from the list of objects
   // waiting for this monitor.
   EnterCriticalSection(&waiters_cs_);
   MonitorWaitData* previous = NULL;
   MonitorWaitData* current = waiters_head_;
   while (current != NULL) {
     if (current == wait_data) {
       if (waiters_head_ == waiters_tail_) {
-        waiters_head_ = waiters_tail_ = NULL;
+        waiters_head_ = NULL;
+        waiters_tail_ = NULL;
       } else if (current == waiters_head_) {
         waiters_head_ = waiters_head_->next_;
       } else if (current == waiters_tail_) {
         ASSERT(previous != NULL);
         waiters_tail_ = previous;
         previous->next_ = NULL;
       } else {
         ASSERT(previous != NULL);
         previous->next_ = current->next_;
       }
       // Clear next.
       wait_data->next_ = NULL;
       break;
     }
     previous = current;
     current = current->next_;
   }
   LeaveCriticalSection(&waiters_cs_);
 }
 
 
 void MonitorData::SignalAndRemoveFirstWaiter() {
   EnterCriticalSection(&waiters_cs_);
   MonitorWaitData* first = waiters_head_;
   if (first != NULL) {
     // Remove from list.
     if (waiters_head_ == waiters_tail_) {
-      waiters_tail_ = waiters_head_ = NULL;
+      waiters_tail_ = NULL;
+      waiters_head_ = NULL;
     } else {
       waiters_head_ = waiters_head_->next_;
     }
     // Clear next.
     first->next_ = NULL;
     // Signal event.
     BOOL result = SetEvent(first->event_);
     if (result == 0) {
       FATAL1("Monitor::Notify failed to signal event %d", GetLastError());
     }
   }
   LeaveCriticalSection(&waiters_cs_);
 }
 
 
 void MonitorData::SignalAndRemoveAllWaiters() {
   EnterCriticalSection(&waiters_cs_);
   // Extract list to signal.
   MonitorWaitData* current = waiters_head_;
   // Clear list.
-  waiters_head_ = waiters_tail_ = NULL;
+  waiters_head_ = NULL;
+  waiters_tail_ = NULL;
   // Iterate and signal all events.
   while (current != NULL) {
     // Copy next.
     MonitorWaitData* next = current->next_;
     // Clear next.
     current->next_ = NULL;
     // Signal event.
     BOOL result = SetEvent(current->event_);
     if (result == 0) {
       FATAL1("Failed to set event for NotifyAll %d", GetLastError());
@@ skipping 94 matching lines @@
   // signal. This will be treated as a spurious wake-up and is OK
   // since all uses of monitors should recheck the condition after a
   // Wait.
   data_.SignalAndRemoveAllWaiters();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)