Rollback of r11015, r11014, r11011, r11010 in trunk branch.

src/runtime-profiler.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 54 matching lines @@
 // Number of times a function has to be seen on the stack before it is
 // optimized.
 static const int kProfilerTicksBeforeOptimization = 2;
 
 // Maximum size in bytes of generated code for a function to be optimized
 // the very first time it is seen on the stack.
 static const int kMaxSizeEarlyOpt = 500;
 
 
 Atomic32 RuntimeProfiler::state_ = 0;
-
-// TODO(isolates): Clean up the semaphore when it is no longer required.
-static LazySemaphore<0>::type semaphore = LAZY_SEMAPHORE_INITIALIZER;
+// TODO(isolates): Create the semaphore lazily and clean it up when no
+// longer required.
+Semaphore* RuntimeProfiler::semaphore_ = OS::CreateSemaphore(0);
 
 #ifdef DEBUG
 bool RuntimeProfiler::has_been_globally_set_up_ = false;
 #endif
 bool RuntimeProfiler::enabled_ = false;
 
 
 RuntimeProfiler::RuntimeProfiler(Isolate* isolate)
     : isolate_(isolate),
       sampler_threshold_(kSamplerThresholdInit),
@@ skipping 317 matching lines @@
 }
 
 
 void RuntimeProfiler::HandleWakeUp(Isolate* isolate) {
   // The profiler thread must still be waiting.
   ASSERT(NoBarrier_Load(&state_) >= 0);
   // In IsolateEnteredJS we have already incremented the counter and
   // undid the decrement done by the profiler thread. Increment again
   // to get the right count of active isolates.
   NoBarrier_AtomicIncrement(&state_, 1);
-  semaphore.Pointer()->Signal();
+  semaphore_->Signal();
 }
 
 
 bool RuntimeProfiler::IsSomeIsolateInJS() {
   return NoBarrier_Load(&state_) > 0;
 }
 
 
 bool RuntimeProfiler::WaitForSomeIsolateToEnterJS() {
   Atomic32 old_state = NoBarrier_CompareAndSwap(&state_, 0, -1);
   ASSERT(old_state >= -1);
   if (old_state != 0) return false;
-  semaphore.Pointer()->Wait();
+  semaphore_->Wait();
   return true;
 }
 
 
 void RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(Thread* thread) {
   // Do a fake increment. If the profiler is waiting on the semaphore,
   // the returned state is 0, which can be left as an initial state in
   // case profiling is restarted later. If the profiler is not
   // waiting, the increment will prevent it from waiting, but has to
   // be undone after the profiler is stopped.
   Atomic32 new_state = NoBarrier_AtomicIncrement(&state_, 1);
   ASSERT(new_state >= 0);
   if (new_state == 0) {
     // The profiler thread is waiting. Wake it up. It must check for
     // stop conditions before attempting to wait again.
-    semaphore.Pointer()->Signal();
+    semaphore_->Signal();
   }
   thread->Join();
   // The profiler thread is now stopped. Undo the increment in case it
   // was not waiting.
   if (new_state != 0) {
     NoBarrier_AtomicIncrement(&state_, -1);
   }
 }
 
 
@@ skipping 17 matching lines @@
 
 bool RuntimeProfilerRateLimiter::SuspendIfNecessary() {
   if (!RuntimeProfiler::IsSomeIsolateInJS()) {
     return RuntimeProfiler::WaitForSomeIsolateToEnterJS();
   }
   return false;
 }
 
 
 } }  // namespace v8::internal