| Index: src/cpu-profiler.h
|
| ===================================================================
|
| --- src/cpu-profiler.h (revision 7683)
|
| +++ src/cpu-profiler.h (working copy)
|
| @@ -197,12 +197,12 @@
|
| } } // namespace v8::internal
|
|
|
|
|
| -#define PROFILE(isolate, Call) \
|
| - LOG(isolate, Call); \
|
| - do { \
|
| - if (v8::internal::CpuProfiler::is_profiling()) { \
|
| - v8::internal::CpuProfiler::Call; \
|
| - } \
|
| +#define PROFILE(isolate, Call) \
|
| + LOG(isolate, Call); \
|
| + do { \
|
| + if (v8::internal::CpuProfiler::is_profiling(isolate)) { \
|
| + v8::internal::CpuProfiler::Call; \
|
| + } \
|
| } while (false)
|
| #else
|
| #define PROFILE(isolate, Call) LOG(isolate, Call)
|
| @@ -261,10 +261,6 @@
|
|
|
| // TODO(isolates): this doesn't have to use atomics anymore.
|
|
|
| - static INLINE(bool is_profiling()) {
|
| - return is_profiling(Isolate::Current());
|
| - }
|
| -
|
| static INLINE(bool is_profiling(Isolate* isolate)) {
|
| CpuProfiler* profiler = isolate->cpu_profiler();
|
| return profiler != NULL && NoBarrier_Load(&profiler->is_profiling_);
|
| @@ -292,7 +288,7 @@
|
| Atomic32 is_profiling_;
|
|
|
| #else
|
| - static INLINE(bool is_profiling()) { return false; }
|
| + static INLINE(bool is_profiling(Isolate* isolate)) { return false; }
|
| #endif // ENABLE_LOGGING_AND_PROFILING
|
|
|
| private:
|
|
|