JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / API / JSProfilerPrivate.cpp

diff --git a/API/JSProfilerPrivate.cpp b/API/JSProfilerPrivate.cpp
index ea277f05977ac1681d5fd2d6b3994de49dc3178f..ac112ae6effcc5662aec20f4c8f400d4647d30a7 100644 (file)
--- a/API/JSProfilerPrivate.cpp
+++ b/API/JSProfilerPrivate.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -27,20 +27,24 @@
 #include "JSProfilerPrivate.h"
 
 #include "APICast.h"
+#include "LegacyProfiler.h"
 #include "OpaqueJSString.h"
-#include "Profiler.h"
 
 using namespace JSC;
 
 void JSStartProfiling(JSContextRef ctx, JSStringRef title)
 {
-    Profiler::profiler()->startProfiling(toJS(ctx), title->ustring());
+    // Use an independent stopwatch for API-initiated profiling, since the user will expect it
+    // to be relative to when their command was issued.
+    RefPtr<Stopwatch> stopwatch = Stopwatch::create();
+    stopwatch->start();
+    LegacyProfiler::profiler()->startProfiling(toJS(ctx), title->string(), stopwatch.release());
 }
 
 void JSEndProfiling(JSContextRef ctx, JSStringRef title)
 {
     ExecState* exec = toJS(ctx);
-    Profiler* profiler = Profiler::profiler();
-    profiler->stopProfiling(exec, title->ustring());
+    LegacyProfiler* profiler = LegacyProfiler::profiler();
+    profiler->stopProfiling(exec, title->string());
 }