Changeset 188338 in webkit

Timestamp:

Aug 12, 2015 11:14:02 AM (9 years ago)

Author:

mark.lam@apple.com

Message:

Add a JSC option to enable the watchdog for testing.
​https://bugs.webkit.org/show_bug.cgi?id=147939

Reviewed by Michael Saboff.

• API/JSContextRef.cpp:

(JSContextGroupSetExecutionTimeLimit):
(createWatchdogIfNeeded): Deleted.

• runtime/Options.h:
• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::~VM):
(JSC::VM::sharedInstanceInternal):
(JSC::VM::ensureWatchdog):
(JSC::thunkGeneratorForIntrinsic):

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSContextRef.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)
• runtime/VM.cpp (modified) (2 diffs)
• runtime/VM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -93 +93 @@
 }
 
-static void createWatchdogIfNeeded(VM& vm)
-{
-    if (!vm.watchdog) {
-        vm.watchdog = adoptRef(new Watchdog());
-
-        // The LLINT peeks into the Watchdog object directly. In order to do that,
-        // the LLINT assumes that the internal shape of a std::unique_ptr is the
-        // same as a plain C++ pointer, and loads the address of Watchdog from it.
-        RELEASE_ASSERT(*reinterpret_cast<Watchdog**>(&vm.watchdog) == vm.watchdog.get());
-    }
-}
-
 void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef group, double limit, JSShouldTerminateCallback callback, void* callbackData)
 {
     VM& vm = *toJS(group);
     JSLockHolder locker(&vm);
-    createWatchdogIfNeeded(vm);
-    Watchdog& watchdog = *vm.watchdog;
+    Watchdog& watchdog = vm.ensureWatchdog();
     if (callback) {
         void* callbackPtr = reinterpret_cast<void*>(callback);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-12  Mark Lam  <mark.lam@apple.com>
+
+        Add a JSC option to enable the watchdog for testing.
+        https://bugs.webkit.org/show_bug.cgi?id=147939
+
+        Reviewed by Michael Saboff.
+
+        * API/JSContextRef.cpp:
+        (JSContextGroupSetExecutionTimeLimit):
+        (createWatchdogIfNeeded): Deleted.
+        * runtime/Options.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        (JSC::VM::~VM):
+        (JSC::VM::sharedInstanceInternal):
+        (JSC::VM::ensureWatchdog):
+        (JSC::thunkGeneratorForIntrinsic):
+        * runtime/VM.h:
+
 2015-08-11  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -321 +321 @@
     v(bool, enableDollarVM, false, "installs the $vm debugging tool in global objects") \
     v(optionString, functionOverrides, nullptr, "file with debugging overrides for function bodies") \
+    \
+    v(unsigned, watchdog, 0, "watchdog timeout (0 = Disabled, N = a timeout period of N milliseconds)") \
 
 class Options {

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -287 +287 @@
     if (Options::enableControlFlowProfiler())
         enableControlFlowProfiler();
+
+    if (Options::watchdog()) {
+        std::chrono::milliseconds timeoutMillis(Options::watchdog());
+        Watchdog& watchdog = ensureWatchdog();
+        watchdog.setTimeLimit(*this, timeoutMillis);
+    }
 }
 
@@ -370 +376 @@
     static VM* sharedInstance;
     return sharedInstance;
+}
+
+Watchdog& VM::ensureWatchdog()
+{
+    if (!watchdog) {
+        watchdog = adoptRef(new Watchdog());
+        
+        // The LLINT peeks into the Watchdog object directly. In order to do that,
+        // the LLINT assumes that the internal shape of a std::unique_ptr is the
+        // same as a plain C++ pointer, and loads the address of Watchdog from it.
+        RELEASE_ASSERT(*reinterpret_cast<Watchdog**>(&watchdog) == watchdog.get());
+    }
+    return *watchdog;
 }
 

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -238 +238 @@
     JS_EXPORT_PRIVATE ~VM();
 
+    Watchdog& ensureWatchdog();
+
 private:
     RefPtr<JSLock> m_apiLock;