Actually stop shark when stopProfiling() is called (bug 626437, r=bz).
authorAndreas Gal <gal@mozilla.com>
Thu, 20 Jan 2011 18:24:08 -0800
changeset 61065 33313f209f4d1a161648732b25c34271d120eb64
parent 61064 b03242ce2fce26958fcab6a4d61b932784394868
child 61066 ccd420e49864c24f889afa6ef0521f446b8a01ce
push idunknown
push userunknown
push dateunknown
reviewersbz
bugs626437
milestone2.0b10pre
Actually stop shark when stopProfiling() is called (bug 626437, r=bz).
js/src/jsdbgapi.cpp
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1922,23 +1922,24 @@ JS_StopProfiling()
     Probes::stopProfiling();
 }
 
 #ifdef MOZ_PROFILING
 
 static JSBool
 StartProfiling(JSContext *cx, uintN argc, jsval *vp)
 {
-    JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(Probes::startProfiling()));
+    JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(JS_StartProfiling()));
     return true;
 }
 
 static JSBool
 StopProfiling(JSContext *cx, uintN argc, jsval *vp)
 {
+    JS_StopProfiling();
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return true;
 }
 
 #ifdef MOZ_SHARK
 
 static JSBool
 IgnoreAndReturnTrue(JSContext *cx, uintN argc, jsval *vp)