Cleanup Mutex and related classes.

test/cctest/test-debug.cc

 // Copyright 2012 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 4660 matching lines @@
 // k'th time, then all calls return.  Each ThreadBarrier object can only
 // be used once.
 class ThreadBarrier {
  public:
   explicit ThreadBarrier(int num_threads);
   ~ThreadBarrier();
   void Wait();
  private:
   int num_threads_;
   int num_blocked_;
-  v8::internal::Mutex* lock_;
+  v8::internal::Mutex lock_;
   v8::internal::Semaphore* sem_;
   bool invalid_;
 };
 
 ThreadBarrier::ThreadBarrier(int num_threads)
     : num_threads_(num_threads), num_blocked_(0) {
-  lock_ = OS::CreateMutex();
   sem_ = OS::CreateSemaphore(0);
   invalid_ = false;  // A barrier may only be used once.  Then it is invalid.
 }
 
 
 // Do not call, due to race condition with Wait().
 // Could be resolved with Pthread condition variables.
 ThreadBarrier::~ThreadBarrier() {
-  lock_->Lock();
-  delete lock_;
   delete sem_;
 }
 
 
 void ThreadBarrier::Wait() {
-  lock_->Lock();
+  lock_.Lock();
   CHECK(!invalid_);
   if (num_blocked_ == num_threads_ - 1) {
     // Signal and unblock all waiting threads.
     for (int i = 0; i < num_threads_ - 1; ++i) {
       sem_->Signal();
     }
     invalid_ = true;
     printf("BARRIER\n\n");
     fflush(stdout);
-    lock_->Unlock();
+    lock_.Unlock();
   } else {  // Wait for the semaphore.
     ++num_blocked_;
-    lock_->Unlock();  // Potential race condition with destructor because
+    lock_.Unlock();  // Potential race condition with destructor because
     sem_->Wait();  // these two lines are not atomic.
   }
 }
 
 
 // A set containing enough barriers and semaphores for any of the tests.
 class Barriers {
  public:
   Barriers();
   void Initialize();
@@ skipping 2825 matching lines @@
 TEST(LiveEditDisabled) {
   v8::internal::FLAG_allow_natives_syntax = true;
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
   v8::Debug::SetLiveEditEnabled(false);
   CompileRun("%LiveEditCompareStrings('', '')");
 }
 
 
 #endif  // ENABLE_DEBUGGER_SUPPORT