Changeset 188147 in webkit

Timestamp:

Aug 7, 2015 12:34:13 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Rename some variables in the JSC watchdog implementation.
​https://bugs.webkit.org/show_bug.cgi?id=147790

Rubber stamped by Benjamin Poulain.

This is just a refactoring patch to give the variable better names that describe their
intended use. There is no behavior change.

• runtime/Watchdog.cpp:

(JSC::Watchdog::Watchdog):
(JSC::Watchdog::setTimeLimit):
(JSC::Watchdog::didFire):
(JSC::Watchdog::isEnabled):
(JSC::Watchdog::fire):
(JSC::Watchdog::startCountdownIfNeeded):

• runtime/Watchdog.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Watchdog.cpp (modified) (6 diffs)
• runtime/Watchdog.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-07  Mark Lam  <mark.lam@apple.com>
+
+        Rename some variables in the JSC watchdog implementation.
+        https://bugs.webkit.org/show_bug.cgi?id=147790
+
+        Rubber stamped by Benjamin Poulain.
+
+        This is just a refactoring patch to give the variable better names that describe their
+        intended use.  There is no behavior change.
+
+        * runtime/Watchdog.cpp:
+        (JSC::Watchdog::Watchdog):
+        (JSC::Watchdog::setTimeLimit):
+        (JSC::Watchdog::didFire):
+        (JSC::Watchdog::isEnabled):
+        (JSC::Watchdog::fire):
+        (JSC::Watchdog::startCountdownIfNeeded):
+        * runtime/Watchdog.h:
+
 2015-08-07  Saam barati  <saambarati1@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/Watchdog.cpp

@@ -38 +38 @@
     : m_timerDidFire(false)
     , m_didFire(false)
-    , m_limit(NO_LIMIT)
-    , m_startTime(0)
-    , m_elapsedTime(0)
+    , m_timeoutPeriod(NO_LIMIT)
+    , m_startCPUTime(0)
+    , m_elapsedCPUTime(0)
     , m_reentryCount(0)
     , m_isStopped(true)
@@ -67 +67 @@
     m_didFire = false; // Reset the watchdog.
 
-    m_limit = limit;
+    m_timeoutPeriod = limit;
     m_callback = callback;
     m_callbackData1 = data1;
@@ -99 +99 @@
 
     auto currentTime = currentCPUTime();
-    auto deltaTime = currentTime - m_startTime;
-    auto totalElapsedTime = m_elapsedTime + deltaTime;
-    if (totalElapsedTime > m_limit) {
+    auto deltaCPUTime = currentTime - m_startCPUTime;
+    auto totalElapsedCPUTime = m_elapsedCPUTime + deltaCPUTime;
+    if (totalElapsedCPUTime > m_timeoutPeriod) {
         // Case 1: the allowed CPU time has elapsed.
 
@@ -122 +122 @@
         // Tell the timer to alarm us again when it thinks we've reached the
         // end of the allowed time.
-        auto remainingTime = m_limit - totalElapsedTime;
-        m_elapsedTime = totalElapsedTime;
-        m_startTime = currentTime;
-        startCountdown(remainingTime);
+        auto remainingCPUTime = m_timeoutPeriod - totalElapsedCPUTime;
+        m_elapsedCPUTime = totalElapsedCPUTime;
+        m_startCPUTime = currentTime;
+        startCountdown(remainingCPUTime);
     }
 
@@ -133 +133 @@
 bool Watchdog::isEnabled()
 {
-    return (m_limit != NO_LIMIT);
+    return (m_timeoutPeriod != NO_LIMIT);
 }
 
@@ -165 +165 @@
 
     if (isEnabled()) {
-        m_elapsedTime = std::chrono::microseconds::zero();
-        m_startTime = currentCPUTime();
-        startCountdown(m_limit);
+        m_elapsedCPUTime = std::chrono::microseconds::zero();
+        m_startCPUTime = currentCPUTime();
+        startCountdown(m_timeoutPeriod);
     }
 }

trunk/Source/JavaScriptCore/runtime/Watchdog.h

@@ -83 +83 @@
     bool m_didFire;
 
-    std::chrono::microseconds m_limit;
-    std::chrono::microseconds m_startTime;
-    std::chrono::microseconds m_elapsedTime;
+    std::chrono::microseconds m_timeoutPeriod;
+    std::chrono::microseconds m_startCPUTime;
+    std::chrono::microseconds m_elapsedCPUTime;
 
     int m_reentryCount;