@@ -1,3 +1,33 @@
+2018-03-01  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Remove monotonicallyIncreasingTime
+        https://bugs.webkit.org/show_bug.cgi?id=182911
+
+        Reviewed by Michael Catanzaro.
+
+        * debugger/Debugger.cpp:
+        (JSC::Debugger::willEvaluateScript):
+        (JSC::Debugger::didEvaluateScript):
+        * debugger/Debugger.h:
+        * debugger/ScriptProfilingScope.h:
+        * inspector/agents/InspectorDebuggerAgent.cpp:
+        (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
+        * inspector/agents/InspectorHeapAgent.cpp:
+        (Inspector::InspectorHeapAgent::snapshot):
+        (Inspector::InspectorHeapAgent::didGarbageCollect):
+        (Inspector::InspectorHeapAgent::dispatchGarbageCollectedEvent):
+        * inspector/agents/InspectorHeapAgent.h:
+        * inspector/agents/InspectorScriptProfilerAgent.cpp:
+        (Inspector::InspectorScriptProfilerAgent::startTracking):
+        (Inspector::InspectorScriptProfilerAgent::willEvaluateScript):
+        (Inspector::InspectorScriptProfilerAgent::didEvaluateScript):
+        (Inspector::InspectorScriptProfilerAgent::addEvent):
+        (Inspector::buildSamples):
+        * inspector/agents/InspectorScriptProfilerAgent.h:
+        * runtime/SamplingProfiler.cpp:
+        (JSC::SamplingProfiler::takeSample):
+        * runtime/SamplingProfiler.h:
+
 2018-03-01  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         ASSERTION FAILED: matchContextualKeyword(m_vm->propertyNames->async)
 
@@ -247,12 +247,12 @@ void Debugger::setProfilingClient(ProfilingClient* client)
     m_profilingClient = client;
 }
 
-double Debugger::willEvaluateScript()
+Seconds Debugger::willEvaluateScript()
 {
     return m_profilingClient->willEvaluateScript();
 }
 
-void Debugger::didEvaluateScript(double startTime, ProfilingReason reason)
+void Debugger::didEvaluateScript(Seconds startTime, ProfilingReason reason)
 {
     m_profilingClient->didEvaluateScript(startTime, reason);
 }
 
@@ -140,15 +140,15 @@ class JS_EXPORT_PRIVATE Debugger {
     public:
         virtual ~ProfilingClient();
         virtual bool isAlreadyProfiling() const = 0;
-        virtual double willEvaluateScript() = 0;
-        virtual void didEvaluateScript(double startTime, ProfilingReason) = 0;
+        virtual Seconds willEvaluateScript() = 0;
+        virtual void didEvaluateScript(Seconds startTime, ProfilingReason) = 0;
     };
 
     void setProfilingClient(ProfilingClient*);
     bool hasProfilingClient() const { return m_profilingClient != nullptr; }
     bool isAlreadyProfiling() const { return m_profilingClient && m_profilingClient->isAlreadyProfiling(); }
-    double willEvaluateScript();
-    void didEvaluateScript(double startTime, ProfilingReason);
+    Seconds willEvaluateScript();
+    void didEvaluateScript(Seconds startTime, ProfilingReason);
 
 protected:
     virtual void handleBreakpointHit(JSGlobalObject*, const Breakpoint&) { }
 
@@ -83,7 +83,7 @@ class ScriptProfilingScope {
     }
 
     JSGlobalObject* m_globalObject { nullptr };
-    std::optional<double> m_startTime;
+    std::optional<Seconds> m_startTime;
     ProfilingReason m_reason;
 };
 
 
@@ -1041,7 +1041,7 @@ void InspectorDebuggerAgent::breakpointActionProbe(JSC::ExecState& scriptState,
         .setProbeId(action.identifier)
         .setBatchId(batchId)
         .setSampleId(sampleId)
-        .setTimestamp(m_injectedScriptManager.inspectorEnvironment().executionStopwatch()->elapsedTime())
+        .setTimestamp(m_injectedScriptManager.inspectorEnvironment().executionStopwatch()->elapsedTime().seconds())
         .setPayload(WTFMove(payload))
         .release();
     m_frontendDispatcher->didSampleProbe(WTFMove(result));
 
@@ -103,7 +103,7 @@ void InspectorHeapAgent::snapshot(ErrorString&, double* timestamp, String* snaps
     HeapSnapshotBuilder snapshotBuilder(vm.ensureHeapProfiler());
     snapshotBuilder.buildSnapshot();
 
-    *timestamp = m_environment.executionStopwatch()->elapsedTime();
+    *timestamp = m_environment.executionStopwatch()->elapsedTime().seconds();
     *snapshotData = snapshotBuilder.json([&] (const HeapSnapshotNode& node) {
         if (Structure* structure = node.cell->structure(vm)) {
             if (JSGlobalObject* globalObject = structure->globalObject()) {
@@ -273,7 +273,7 @@ void InspectorHeapAgent::willGarbageCollect()
 void InspectorHeapAgent::didGarbageCollect(CollectionScope scope)
 {
     if (!m_enabled) {
-        m_gcStartTime = NAN;
+        m_gcStartTime = Seconds::nan();
         return;
     }
 
@@ -284,10 +284,10 @@ void InspectorHeapAgent::didGarbageCollect(CollectionScope scope)
 
     // FIXME: Include number of bytes freed by collection.
 
-    double endTime = m_environment.executionStopwatch()->elapsedTime();
+    Seconds endTime = m_environment.executionStopwatch()->elapsedTime();
     dispatchGarbageCollectedEvent(protocolTypeForHeapOperation(scope), m_gcStartTime, endTime);
 
-    m_gcStartTime = NAN;
+    m_gcStartTime = Seconds::nan();
 }
 
 void InspectorHeapAgent::clearHeapSnapshots()
@@ -301,12 +301,12 @@ void InspectorHeapAgent::clearHeapSnapshots()
     }
 }
 
-void InspectorHeapAgent::dispatchGarbageCollectedEvent(Protocol::Heap::GarbageCollection::Type type, double startTime, double endTime)
+void InspectorHeapAgent::dispatchGarbageCollectedEvent(Protocol::Heap::GarbageCollection::Type type, Seconds startTime, Seconds endTime)
 {
     auto protocolObject = Protocol::Heap::GarbageCollection::create()
         .setType(type)
-        .setStartTime(startTime)
-        .setEndTime(endTime)
+        .setStartTime(startTime.seconds())
+        .setEndTime(endTime.seconds())
         .release();
 
     m_frontendDispatcher->garbageCollected(WTFMove(protocolObject));
 
@@ -31,6 +31,7 @@
 #include "InspectorFrontendDispatchers.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/Seconds.h>
 
 namespace JSC {
 struct HeapSnapshotNode;
@@ -68,7 +69,7 @@ class JS_EXPORT_PRIVATE InspectorHeapAgent : public InspectorAgentBase, public H
 protected:
     void clearHeapSnapshots();
 
-    virtual void dispatchGarbageCollectedEvent(Protocol::Heap::GarbageCollection::Type, double startTime, double endTime);
+    virtual void dispatchGarbageCollectedEvent(Protocol::Heap::GarbageCollection::Type, Seconds startTime, Seconds endTime);
 
 private:
     std::optional<JSC::HeapSnapshotNode> nodeForHeapObjectIdentifier(ErrorString&, unsigned heapObjectIdentifier);
@@ -80,7 +81,7 @@ class JS_EXPORT_PRIVATE InspectorHeapAgent : public InspectorAgentBase, public H
 
     bool m_enabled { false };
     bool m_tracking { false };
-    double m_gcStartTime { NAN };
+    Seconds m_gcStartTime { Seconds::nan() };
 };
 
 } // namespace Inspector
@@ -90,7 +90,7 @@ void InspectorScriptProfilerAgent::startTracking(ErrorString&, const bool* inclu
 
     m_environment.scriptDebugServer().setProfilingClient(this);
 
-    m_frontendDispatcher->trackingStart(m_environment.executionStopwatch()->elapsedTime());
+    m_frontendDispatcher->trackingStart(m_environment.executionStopwatch()->elapsedTime().seconds());
 }
 
 void InspectorScriptProfilerAgent::stopTracking(ErrorString&)
@@ -111,7 +111,7 @@ bool InspectorScriptProfilerAgent::isAlreadyProfiling() const
     return m_activeEvaluateScript;
 }
 
-double InspectorScriptProfilerAgent::willEvaluateScript()
+Seconds InspectorScriptProfilerAgent::willEvaluateScript()
 {
     m_activeEvaluateScript = true;
 
@@ -126,11 +126,11 @@ double InspectorScriptProfilerAgent::willEvaluateScript()
     return m_environment.executionStopwatch()->elapsedTime();
 }
 
-void InspectorScriptProfilerAgent::didEvaluateScript(double startTime, ProfilingReason reason)
+void InspectorScriptProfilerAgent::didEvaluateScript(Seconds startTime, ProfilingReason reason)
 {
     m_activeEvaluateScript = false;
 
-    double endTime = m_environment.executionStopwatch()->elapsedTime();
+    Seconds endTime = m_environment.executionStopwatch()->elapsedTime();
 
     addEvent(startTime, endTime, reason);
 }
@@ -150,13 +150,13 @@ static Protocol::ScriptProfiler::EventType toProtocol(ProfilingReason reason)
     return Protocol::ScriptProfiler::EventType::Other;
 }
 
-void InspectorScriptProfilerAgent::addEvent(double startTime, double endTime, ProfilingReason reason)
+void InspectorScriptProfilerAgent::addEvent(Seconds startTime, Seconds endTime, ProfilingReason reason)
 {
     ASSERT(endTime >= startTime);
 
     auto event = Protocol::ScriptProfiler::Event::create()
-        .setStartTime(startTime)
-        .setEndTime(endTime)
+        .setStartTime(startTime.seconds())
+        .setEndTime(endTime.seconds())
         .setType(toProtocol(reason))
         .release();
 
@@ -189,7 +189,7 @@ static Ref<Protocol::ScriptProfiler::Samples> buildSamples(VM& vm, Vector<Sampli
             frames->addItem(WTFMove(frameObject));
         }
         Ref<Protocol::ScriptProfiler::StackTrace> inspectorStackTrace = Protocol::ScriptProfiler::StackTrace::create()
-            .setTimestamp(stackTrace.timestamp)
+            .setTimestamp(stackTrace.timestamp.seconds())
             .setStackFrames(WTFMove(frames))
             .release();
         stackTraces->addItem(WTFMove(inspectorStackTrace));
 
@@ -58,11 +58,11 @@ class JS_EXPORT_PRIVATE InspectorScriptProfilerAgent final : public InspectorAge
 
     // Debugger::ProfilingClient
     bool isAlreadyProfiling() const override;
-    double willEvaluateScript() override;
-    void didEvaluateScript(double, JSC::ProfilingReason) override;
+    Seconds willEvaluateScript() override;
+    void didEvaluateScript(Seconds, JSC::ProfilingReason) override;
 
 private:
-    void addEvent(double startTime, double endTime, JSC::ProfilingReason);
+    void addEvent(Seconds startTime, Seconds endTime, JSC::ProfilingReason);
     void trackingComplete();
     void stopSamplingWhenDisconnecting();
 
 
@@ -336,7 +336,7 @@ void SamplingProfiler::takeSample(const AbstractLocker&, Seconds& stackTraceProc
 {
     ASSERT(m_lock.isLocked());
     if (m_vm.entryScope) {
-        double nowTime = m_stopwatch->elapsedTime();
+        Seconds nowTime = m_stopwatch->elapsedTime();
 
         auto machineThreadsLocker = holdLock(m_vm.heap.machineThreads().getLock());
         LockHolder codeBlockSetLocker(m_vm.heap.codeBlockSet().getLock());
Original file line number	Diff line number	Diff line change
`@@ -247,12 +247,12 @@ void Debugger::setProfilingClient(ProfilingClient* client)`
`247`	`247`	`m_profilingClient = client;`
`248`	`248`	`}`
`249`	`249`
`250`		`-double Debugger::willEvaluateScript()`
	`250`	`+Seconds Debugger::willEvaluateScript()`
`251`	`251`	`{`
`252`	`252`	`return m_profilingClient->willEvaluateScript();`
`253`	`253`	`}`
`254`	`254`
`255`		`-void Debugger::didEvaluateScript(double startTime, ProfilingReason reason)`
	`255`	`+void Debugger::didEvaluateScript(Seconds startTime, ProfilingReason reason)`
`256`	`256`	`{`
`257`	`257`	`m_profilingClient->didEvaluateScript(startTime, reason);`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class ScriptProfilingScope {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`JSGlobalObject* m_globalObject { nullptr };`
`86`		`- std::optional<double> m_startTime;`
	`86`	`+ std::optional<Seconds> m_startTime;`
`87`	`87`	`ProfilingReason m_reason;`
`88`	`88`	`};`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void InspectorScriptProfilerAgent::startTracking(ErrorString&, const bool* inclu`
`90`	`90`
`91`	`91`	`m_environment.scriptDebugServer().setProfilingClient(this);`
`92`	`92`
`93`		`- m_frontendDispatcher->trackingStart(m_environment.executionStopwatch()->elapsedTime());`
	`93`	`+ m_frontendDispatcher->trackingStart(m_environment.executionStopwatch()->elapsedTime().seconds());`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`void InspectorScriptProfilerAgent::stopTracking(ErrorString&)`
`@@ -111,7 +111,7 @@ bool InspectorScriptProfilerAgent::isAlreadyProfiling() const`
`111`	`111`	`return m_activeEvaluateScript;`
`112`	`112`	`}`
`113`	`113`
`114`		`-double InspectorScriptProfilerAgent::willEvaluateScript()`
	`114`	`+Seconds InspectorScriptProfilerAgent::willEvaluateScript()`
`115`	`115`	`{`
`116`	`116`	`m_activeEvaluateScript = true;`
`117`	`117`
`@@ -126,11 +126,11 @@ double InspectorScriptProfilerAgent::willEvaluateScript()`
`126`	`126`	`return m_environment.executionStopwatch()->elapsedTime();`
`127`	`127`	`}`
`128`	`128`
`129`		`-void InspectorScriptProfilerAgent::didEvaluateScript(double startTime, ProfilingReason reason)`
	`129`	`+void InspectorScriptProfilerAgent::didEvaluateScript(Seconds startTime, ProfilingReason reason)`
`130`	`130`	`{`
`131`	`131`	`m_activeEvaluateScript = false;`
`132`	`132`
`133`		`- double endTime = m_environment.executionStopwatch()->elapsedTime();`
	`133`	`+ Seconds endTime = m_environment.executionStopwatch()->elapsedTime();`
`134`	`134`
`135`	`135`	`addEvent(startTime, endTime, reason);`
`136`	`136`	`}`
`@@ -150,13 +150,13 @@ static Protocol::ScriptProfiler::EventType toProtocol(ProfilingReason reason)`
`150`	`150`	`return Protocol::ScriptProfiler::EventType::Other;`
`151`	`151`	`}`
`152`	`152`
`153`		`-void InspectorScriptProfilerAgent::addEvent(double startTime, double endTime, ProfilingReason reason)`
	`153`	`+void InspectorScriptProfilerAgent::addEvent(Seconds startTime, Seconds endTime, ProfilingReason reason)`
`154`	`154`	`{`
`155`	`155`	`ASSERT(endTime >= startTime);`
`156`	`156`
`157`	`157`	`auto event = Protocol::ScriptProfiler::Event::create()`
`158`		`- .setStartTime(startTime)`
`159`		`- .setEndTime(endTime)`
	`158`	`+ .setStartTime(startTime.seconds())`
	`159`	`+ .setEndTime(endTime.seconds())`
`160`	`160`	`.setType(toProtocol(reason))`
`161`	`161`	`.release();`
`162`	`162`
`@@ -189,7 +189,7 @@ static Ref<Protocol::ScriptProfiler::Samples> buildSamples(VM& vm, Vector<Sampli`
`189`	`189`	`frames->addItem(WTFMove(frameObject));`
`190`	`190`	`}`
`191`	`191`	`Ref<Protocol::ScriptProfiler::StackTrace> inspectorStackTrace = Protocol::ScriptProfiler::StackTrace::create()`
`192`		`- .setTimestamp(stackTrace.timestamp)`
	`192`	`+ .setTimestamp(stackTrace.timestamp.seconds())`
`193`	`193`	`.setStackFrames(WTFMove(frames))`
`194`	`194`	`.release();`
`195`	`195`	`stackTraces->addItem(WTFMove(inspectorStackTrace));`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ void SamplingProfiler::takeSample(const AbstractLocker&, Seconds& stackTraceProc`
`336`	`336`	`{`
`337`	`337`	`ASSERT(m_lock.isLocked());`
`338`	`338`	`if (m_vm.entryScope) {`
`339`		`- double nowTime = m_stopwatch->elapsedTime();`
	`339`	`+ Seconds nowTime = m_stopwatch->elapsedTime();`
`340`	`340`
`341`	`341`	`auto machineThreadsLocker = holdLock(m_vm.heap.machineThreads().getLock());`
`342`	`342`	`LockHolder codeBlockSetLocker(m_vm.heap.codeBlockSet().getLock());`