Chromium Code Reviews| Index: src/sampler.h |
| diff --git a/src/sampler.h b/src/sampler.h |
| index c3dce4ed7c2fec7e353cb06d1641f63e82092a84..fc1fef196a8d462e859bb3356f5069c02801c315 100644 |
| --- a/src/sampler.h |
| +++ b/src/sampler.h |
| @@ -5,6 +5,8 @@ |
| #ifndef V8_SAMPLER_H_ |
| #define V8_SAMPLER_H_ |
| +#include "include/v8.h" |
| + |
| #include "src/base/atomicops.h" |
| #include "src/frames.h" |
| #include "src/globals.h" |
| @@ -14,6 +16,16 @@ namespace internal { |
| class Isolate; |
| +class ScopedSemaphore { |
|
alph
2014/09/09 13:54:37
Move it into the cc file?
|
| + public: |
| + explicit ScopedSemaphore(base::Semaphore* sem) { semaphore_ = sem; } |
| + ~ScopedSemaphore() { semaphore_->Signal(); } |
| + |
| + private: |
| + base::Semaphore* semaphore_; |
|
yurys
2014/09/09 14:35:20
semaphore.h would be a more appropriate place for
gholap
2014/09/17 02:35:06
Yes agreed. Another alternative could be, as alph
|
| +}; |
| + |
| + |
| // ---------------------------------------------------------------------------- |
| // Sampler |
| // |
| @@ -34,21 +46,20 @@ struct TickSample { |
| : state(OTHER), |
| pc(NULL), |
| external_callback(NULL), |
| - frames_count(0), |
| has_external_callback(false), |
| top_frame_type(StackFrame::NONE) {} |
| void Init(Isolate* isolate, const RegisterState& state); |
| - StateTag state; // The state of the VM. |
| - Address pc; // Instruction pointer. |
| + enum { kMaxFramesCount = 255u }; |
| + |
| + void* stack[kMaxFramesCount]; // Call stack. |
| + size_t frames_count; // Number of captured frames. |
| + StateTag state; // The state of the VM. |
| + Address pc; // Instruction pointer. |
| union { |
| Address tos; // Top stack value (*sp). |
| Address external_callback; |
| }; |
| - static const unsigned kMaxFramesCountLog2 = 8; |
| - static const unsigned kMaxFramesCount = (1 << kMaxFramesCountLog2) - 1; |
| - Address stack[kMaxFramesCount]; // Call stack. |
| base::TimeTicks timestamp; |
| - unsigned frames_count : kMaxFramesCountLog2; // Number of captured frames. |
| bool has_external_callback : 1; |
| StackFrame::Type top_frame_type : 4; |
| }; |
| @@ -85,6 +96,7 @@ class Sampler { |
| bool IsActive() const { return base::NoBarrier_Load(&active_); } |
| void DoSample(); |
| + void GetSample(v8::Sample* sample); |
| // If true next sample must be initiated on the profiler event processor |
| // thread right after latest sample is processed. |
| void SetHasProcessingThread(bool value) { |
| @@ -120,6 +132,7 @@ class Sampler { |
| bool is_counting_samples_; |
| // Counts stack samples taken in JS VM state. |
| unsigned js_and_external_sample_count_; |
| + void GetSampleHelper(TickSample* sample, bool called_from_get_sample); |
| DISALLOW_IMPLICIT_CONSTRUCTORS(Sampler); |
| }; |