Initial GetSample implementation.

src/sampler.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
 #include "src/sampler.h"
 
 #if V8_OS_POSIX && !V8_OS_CYGWIN
 
 #define USE_SIGNALS
 
 #include <errno.h>
 #include <pthread.h>
 #include <signal.h>
 #include <sys/time.h>
@@ skipping 22 matching lines @@
 #endif
 
 #elif V8_OS_WIN || V8_OS_CYGWIN
 
 #include "src/base/win32-headers.h"
 
 #endif
 
 #include "src/v8.h"
 
+#include "src/base/logging.h"
 #include "src/base/platform/platform.h"
 #include "src/cpu-profiler-inl.h"
 #include "src/flags.h"
 #include "src/frames-inl.h"
 #include "src/log.h"
 #include "src/simulator.h"
 #include "src/v8threads.h"
 #include "src/vm-state-inl.h"
 
 
@@ skipping 205 matching lines @@
  private:
   Simulator* simulator_;
 };
 #endif  // USE_SIMULATOR
 
 
 #if defined(USE_SIGNALS)
 
 class SignalHandler : public AllStatic {
  public:
-  static void SetUp() { if (!mutex_) mutex_ = new base::Mutex(); }
-  static void TearDown() { delete mutex_; }
+  static void SetUp() {
+    ASSERT_EQ(NULL, mutex_);
+    ASSERT_EQ(NULL, sampling_semaphore_);
+
+    mutex_ = new base::Mutex();
+    sampling_semaphore_ = new base::Semaphore(0);
+  }
+
+  static void TearDown() {
+    delete mutex_;
+    delete sampling_semaphore_;
+
+    mutex_ = NULL;
+    sampling_semaphore_ = NULL;
+  }
 
   static void IncreaseSamplerCount() {
     base::LockGuard<base::Mutex> lock_guard(mutex_);
     if (++client_count_ == 1) Install();
   }
 
   static void DecreaseSamplerCount() {
     base::LockGuard<base::Mutex> lock_guard(mutex_);
     if (--client_count_ == 0) Restore();
   }
@@ skipping 17 matching lines @@
   }
 
   static void Restore() {
     if (signal_handler_installed_) {
       sigaction(SIGPROF, &old_signal_handler_, 0);
       signal_handler_installed_ = false;
     }
   }
 
   static void HandleProfilerSignal(int signal, siginfo_t* info, void* context);
+
+  // The SIGPROF could have come from DoSample or from GetSample.
+  // GetSample is the internal endpoint for the public
+  // GetSample API, which aims to bypass all the internal buffers
+  // and return just one sample instead, rightaway.
+  // TODO(gholap): Eventually, get rid of DoSample.
+  //               Only GetSample should remain.
+
+  // This is the sample which will be filled by the call from GetSample.
+  static TickSample sample_;
+
+  // For the SIGPROF handler to know whether the call was from GetSample.
+  static volatile bool called_from_get_sample_;
+
+  // GetSample waits synchronously till the SIGPROF handler returns.
+  // this semaphore is used to signal GetSample.
+  static base::Semaphore* sampling_semaphore_;
+
+  // It is not that every time HandleProfilerSignal is invoked,
+  // it succeeds in obtaining a sample.
+  // This provides GetSample with the information whether
+  // the handler finished with or without getting the sample.
+  static bool sample_available_;
+
   // Protects the process wide state below.
   static base::Mutex* mutex_;
   static int client_count_;
   static bool signal_handler_installed_;
   static struct sigaction old_signal_handler_;
+
+  friend class Sampler;
 };
 
 
+TickSample SignalHandler::sample_;
+volatile bool SignalHandler::called_from_get_sample_ = false;
+base::Semaphore* SignalHandler::sampling_semaphore_ = NULL;
+bool SignalHandler::sample_available_ = false;
+
 base::Mutex* SignalHandler::mutex_ = NULL;
 int SignalHandler::client_count_ = 0;
 struct sigaction SignalHandler::old_signal_handler_;
 bool SignalHandler::signal_handler_installed_ = false;
 
 
 void SignalHandler::HandleProfilerSignal(int signal, siginfo_t* info,
                                          void* context) {
 #if V8_OS_NACL
   // As Native Client does not support signal handling, profiling
   // is disabled.
   return;
 #else
+  // Even if we return prematurely,
+  // we need to signal the sampling_semaphore_
+  sample_available_ = false;
+  ScopedSemaphore scoped_semaphore(sampling_semaphore_);
+
   USE(info);
   if (signal != SIGPROF) return;
   Isolate* isolate = Isolate::UncheckedCurrent();
   if (isolate == NULL || !isolate->IsInitialized() || !isolate->IsInUse()) {
     // We require a fully initialized and entered isolate.
     return;
   }
   if (v8::Locker::IsActive() &&
       !isolate->thread_manager()->IsLockedByCurrentThread()) {
     return;
@@ skipping 117 matching lines @@
   state.pc = reinterpret_cast<Address>(mcontext.cpu.eip);
   state.sp = reinterpret_cast<Address>(mcontext.cpu.esp);
   state.fp = reinterpret_cast<Address>(mcontext.cpu.ebp);
 #elif V8_HOST_ARCH_ARM
   state.pc = reinterpret_cast<Address>(mcontext.cpu.gpr[ARM_REG_PC]);
   state.sp = reinterpret_cast<Address>(mcontext.cpu.gpr[ARM_REG_SP]);
   state.fp = reinterpret_cast<Address>(mcontext.cpu.gpr[ARM_REG_FP]);
 #endif  // V8_HOST_ARCH_*
 #endif  // V8_OS_QNX
 #endif  // USE_SIMULATOR
-  sampler->SampleStack(state);
+  if (called_from_get_sample_) {
+    sample_.Init(sampler->isolate(), state);
+  } else {
+    sampler->SampleStack(state);
+  }
+  sample_available_ = true;
 #endif  // V8_OS_NACL
 }
 
 #endif
 
 
 class SamplerThread : public base::Thread {
  public:
   static const int kSamplerThreadStackSize = 64 * KB;
 
@@ skipping 206 matching lines @@
 }
 
 
 #if defined(USE_SIGNALS)
 
 void Sampler::DoSample() {
   if (!SignalHandler::Installed()) return;
   pthread_kill(platform_data()->vm_tid(), SIGPROF);
 }
 
+
+void Sampler::GetSample(v8::Sample* sample) {
+  sample->frames_count = 0;
+  SignalHandler::called_from_get_sample_ = true;
+  pthread_kill(platform_data()->vm_tid(), SIGPROF);
+  SignalHandler::sampling_semaphore_->Wait();
+  if (SignalHandler::sample_available_) {
+    *sample = SignalHandler::sample_;
+  }
+  SignalHandler::called_from_get_sample_ = false;
+}
+
 #elif V8_OS_WIN || V8_OS_CYGWIN
 
-void Sampler::DoSample() {
+void Sampler::GetSampleHelper(TickSample * sample,
+                              bool called_from_get_sample) {
   HANDLE profiled_thread = platform_data()->profiled_thread();
-  if (profiled_thread == NULL) return;
+  if (profiled_thread == NULL) return NULL;
 
 #if defined(USE_SIMULATOR)
   SimulatorHelper helper;
-  if (!helper.Init(this, isolate())) return;
+  if (!helper.Init(this, isolate())) return NULL;
 #endif
 
   const DWORD kSuspendFailed = static_cast<DWORD>(-1);
-  if (SuspendThread(profiled_thread) == kSuspendFailed) return;
+  if (SuspendThread(profiled_thread) == kSuspendFailed) return NULL;
 
   // Context used for sampling the register state of the profiled thread.
   CONTEXT context;
   memset(&context, 0, sizeof(context));
   context.ContextFlags = CONTEXT_FULL;
   if (GetThreadContext(profiled_thread, &context) != 0) {
     RegisterState state;
 #if defined(USE_SIMULATOR)
     helper.FillRegisters(&state);
 #else
 #if V8_HOST_ARCH_X64
     state.pc = reinterpret_cast<Address>(context.Rip);
     state.sp = reinterpret_cast<Address>(context.Rsp);
     state.fp = reinterpret_cast<Address>(context.Rbp);
 #else
     state.pc = reinterpret_cast<Address>(context.Eip);
     state.sp = reinterpret_cast<Address>(context.Esp);
     state.fp = reinterpret_cast<Address>(context.Ebp);
 #endif
 #endif  // USE_SIMULATOR
-    SampleStack(state);
+    if (called_from_get_sample) {
+      sample->Init(sampler->isolate(), state);
+    } else {
+      SampleStack(state);
+    }
   }
   ResumeThread(profiled_thread);
 }
 
+
+void Sampler::DoSample() {
+  GetSampleHelper(NULL, false);
+}
+
+
+void Sampler::GetSample(v8::Sample* sample) {
+  // We need this tick_sample because,
+  // GetSampleHelper calls Init, which must be called on
+  // a TickSample and never on Sample.
+  TickSample tick_sample;
+  sample->frames_count = 0;
+  GetSampleHelper(&tick_sample, true);
+  *sample = reinterpret_cast<v8::Sample>(tick_sample);

[Sven Panne, 2014/09/02 08:15:02]

Remove the cast, it's not necessary.

[gholap, 2014/09/02 08:56:08]

Oops. Done.

+}
+
 #endif  // USE_SIGNALS
 
 
 } }  // namespace v8::internal