Cleanup Semaphore class.

src/platform.h

 // 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 29 matching lines @@
 // slower. It would require factory methods for selecting the right
 // implementation and the overhead of virtual methods for performance
 // sensitive like mutex locking/unlocking.
 
 #ifndef V8_PLATFORM_H_
 #define V8_PLATFORM_H_
 
 #include <cstdarg>
 
 #include "platform/mutex.h"
+#include "platform/semaphore.h"
 #include "utils.h"
 #include "v8globals.h"
 
 #ifdef __sun
 # ifndef signbit
 namespace std {
 int signbit(double x);
 }
 # endif
 #endif
@@ skipping 26 matching lines @@
 #endif  // V8_CC_MSVC
 
 // Random is missing on both Visual Studio and MinGW.
 #if V8_CC_MSVC || V8_CC_MINGW
 int random();
 #endif  // V8_CC_MSVC || V8_CC_MINGW
 
 namespace v8 {
 namespace internal {
 
-class Semaphore;
-
 double ceiling(double x);
 double modulo(double x, double y);
 
 // Custom implementation of math functions.
 double fast_sin(double input);
 double fast_cos(double input);
 double fast_tan(double input);
 double fast_log(double input);
 double fast_exp(double input);
 double fast_sqrt(double input);
@@ skipping 173 matching lines @@
   static const int kStackWalkError = -1;
   static const int kStackWalkMaxNameLen = 256;
   static const int kStackWalkMaxTextLen = 256;
   struct StackFrame {
     void* address;
     char text[kStackWalkMaxTextLen];
   };
 
   static int StackWalk(Vector<StackFrame> frames);
 
-  // Factory method for creating platform dependent Semaphore.
-  // Please use delete to reclaim the storage for the returned Semaphore.
-  static Semaphore* CreateSemaphore(int count);
-
   // Factory method for creating platform dependent Socket.
   // Please use delete to reclaim the storage for the returned Socket.
   static Socket* CreateSocket();
 
   class MemoryMappedFile {
    public:
     static MemoryMappedFile* open(const char* name);
     static MemoryMappedFile* create(const char* name, int size, void* initial);
     virtual ~MemoryMappedFile() { }
     virtual void* memory() = 0;
@@ skipping 198 matching lines @@
   // Otherwise returns false.
   static bool HasLazyCommits();
 
  private:
   void* address_;  // Start address of the virtual memory.
   size_t size_;  // Size of the virtual memory.
 };
 
 
 // ----------------------------------------------------------------------------
-// Semaphore
-//
-// A semaphore object is a synchronization object that maintains a count. The
-// count is decremented each time a thread completes a wait for the semaphore
-// object and incremented each time a thread signals the semaphore. When the
-// count reaches zero,  threads waiting for the semaphore blocks until the
-// count becomes non-zero.
-
-class Semaphore {
- public:
-  virtual ~Semaphore() {}
-
-  // Suspends the calling thread until the semaphore counter is non zero
-  // and then decrements the semaphore counter.
-  virtual void Wait() = 0;
-
-  // Suspends the calling thread until the counter is non zero or the timeout
-  // time has passed. If timeout happens the return value is false and the
-  // counter is unchanged. Otherwise the semaphore counter is decremented and
-  // true is returned. The timeout value is specified in microseconds.
-  virtual bool Wait(int timeout) = 0;
-
-  // Increments the semaphore counter.
-  virtual void Signal() = 0;
-};
-
-template <int InitialValue>
-struct CreateSemaphoreTrait {
-  static Semaphore* Create() {
-    return OS::CreateSemaphore(InitialValue);
-  }
-};
-
-// POD Semaphore initialized lazily (i.e. the first time Pointer() is called).
-// Usage:
-//   // The following semaphore starts at 0.
-//   static LazySemaphore<0>::type my_semaphore = LAZY_SEMAPHORE_INITIALIZER;
-//
-//   void my_function() {
-//     // Do something with my_semaphore.Pointer().
-//   }
-//
-template <int InitialValue>
-struct LazySemaphore {
-  typedef typename LazyDynamicInstance<
-      Semaphore, CreateSemaphoreTrait<InitialValue>,
-      ThreadSafeInitOnceTrait>::type type;
-};
-
-#define LAZY_SEMAPHORE_INITIALIZER LAZY_DYNAMIC_INSTANCE_INITIALIZER
-
-
-// ----------------------------------------------------------------------------
 // Thread
 //
 // Thread objects are used for creating and running threads. When the start()
 // method is called the new thread starts running the run() method in the new
 // thread. The Thread object should not be deallocated before the thread has
 // terminated.
 
 class Thread {
  public:
   // Opaque data type for thread-local storage keys.
@@ skipping 21 matching lines @@
 
   // Create new thread.
   explicit Thread(const Options& options);
   virtual ~Thread();
 
   // Start new thread by calling the Run() method on the new thread.
   void Start();
 
   // Start new thread and wait until Run() method is called on the new thread.
   void StartSynchronously() {
-    start_semaphore_ = OS::CreateSemaphore(0);
+    start_semaphore_ = new Semaphore(0);
     Start();
     start_semaphore_->Wait();
     delete start_semaphore_;
     start_semaphore_ = NULL;
   }
 
   // Wait until thread terminates.
   void Join();
 
   inline const char* name() const {
@@ skipping 96 matching lines @@
   static uint16_t HToN(uint16_t value);
   static uint16_t NToH(uint16_t value);
   static uint32_t HToN(uint32_t value);
   static uint32_t NToH(uint32_t value);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_PLATFORM_H_