[cpu-profiler] Deprecate Isolate::GetCpuProfiler and CpuProfiler::CollectSample functions.

a1ph · Commit Bot · commit 8c5e2d758d78 · 2017-11-21T00:56:56.000Z
BUG=v8:7070 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng Change-Id: I92d7c61afa88e0a52c8eed0c2a44a4e49847e83b Reviewed-on: https://chromium-review.googlesource.com/767618 Reviewed-by: Yang Guo <yangguo@chromium.org> Reviewed-by: Adam Klein <adamk@chromium.org> Commit-Queue: Alexei Filippov <alph@chromium.org> Cr-Commit-Position: refs/heads/master@{#49514}
diff --git a/include/v8-profiler.h b/include/v8-profiler.h
@@ -329,7 +329,8 @@ class V8_EXPORT CpuProfiler {
    * Recording the forced sample does not contribute to the aggregated
    * profile statistics.
    */
-  void CollectSample();
+  V8_DEPRECATED("Use static CollectSample(Isolate*) instead.",
+                void CollectSample());
 
   /**
    * Tells the profiler whether the embedder is idle.
diff --git a/include/v8.h b/include/v8.h
@@ -7312,8 +7312,8 @@ class V8_EXPORT Isolate {
    * is initialized. It is the embedder's responsibility to stop all CPU
    * profiling activities if it has started any.
    */
-  V8_DEPRECATE_SOON("CpuProfiler should be created with CpuProfiler::New call.",
-                    CpuProfiler* GetCpuProfiler());
+  V8_DEPRECATED("CpuProfiler should be created with CpuProfiler::New call.",
+                CpuProfiler* GetCpuProfiler());
 
   /** Returns true if this isolate has a current context. */
   bool InContext();
diff --git a/test/cctest/profiler-extension.cc b/test/cctest/profiler-extension.cc
@@ -74,7 +74,7 @@ void ProfilerExtension::StopProfiling(
 
 void ProfilerExtension::CollectSample(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
-  profiler_->CollectSample();
+  v8::CpuProfiler::CollectSample(args.GetIsolate());
 }
 
 }  // namespace internal
diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
@@ -1473,7 +1473,7 @@ static const char* js_force_collect_sample_source =
     "}";
 
 static void CallCollectSample(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  i::ProfilerExtension::profiler()->CollectSample();
+  v8::CpuProfiler::CollectSample(info.GetIsolate());
 }
 
 TEST(CollectSampleAPI) {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void ProfilerExtension::StopProfiling(`
`74`	`74`
`75`	`75`	`void ProfilerExtension::CollectSample(`
`76`	`76`	`const v8::FunctionCallbackInfo<v8::Value>& args) {`
`77`		`- profiler_->CollectSample();`
	`77`	`+ v8::CpuProfiler::CollectSample(args.GetIsolate());`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`} // namespace internal`
Original file line number	Diff line number	Diff line change
`@@ -1473,7 +1473,7 @@ static const char* js_force_collect_sample_source =`
`1473`	`1473`	`"}";`
`1474`	`1474`
`1475`	`1475`	`static void CallCollectSample(const v8::FunctionCallbackInfo<v8::Value>& info) {`
`1476`		`- i::ProfilerExtension::profiler()->CollectSample();`
	`1476`	`+ v8::CpuProfiler::CollectSample(info.GetIsolate());`
`1477`	`1477`	`}`
`1478`	`1478`
`1479`	`1479`	`TEST(CollectSampleAPI) {`