Changeset 174762 in webkit for trunk/Source/JavaScriptCore/profiler

Timestamp:

Oct 16, 2014, 6:29:55 AM (11 years ago)

Author:

[email protected]

Message:

Use isnan from std namespace in ProfileGenerator.cpp
​https://bugs.webkit.org/show_bug.cgi?id=137653

Patch by Adrien Destugues <​[email protected]> on 2014-10-16
Reviewed by Darin Adler.

The C++ isnan() function is in the std namespace. The unprefixed isnan
may be available because of C99 headers leakage in C++, but should not
be used.

No new tests: no functional change, build fix on platforms which don't
export C99 functions in C++.

• profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::beginCallEntry):
(JSC::ProfileGenerator::endCallEntry):
(JSC::ProfileGenerator::didPause):
(JSC::ProfileGenerator::didContinue):

File:

• trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -118 +118 @@
     ASSERT_ARG(node, node);
 
-    if (isnan(startTime))
+    if (std::isnan(startTime))
         startTime = currentTime();
 
     // If the debugger is paused when beginning, then don't set the start time. It
     // will be fixed up when the debugger unpauses or the call entry ends.
-    if (!isnan(m_debuggerPausedTimestamp))
+    if (!std::isnan(m_debuggerPausedTimestamp))
         startTime = NAN;
 
@@ -136 +136 @@
 
     // If the debugger is paused, ignore the interval that ends now.
-    if (!isnan(m_debuggerPausedTimestamp) && !isnan(last.elapsedTime()))
+    if (!std::isnan(m_debuggerPausedTimestamp) && !std::isnan(last.elapsedTime()))
         return;
 
     // If paused and no time was accrued then the debugger was never unpaused. The call will
     // have no time accrued and appear to have started when the debugger was paused.
-    if (!isnan(m_debuggerPausedTimestamp)) {
+    if (!std::isnan(m_debuggerPausedTimestamp)) {
         last.setStartTime(m_debuggerPausedTimestamp);
         last.setElapsedTime(0.0);
@@ -148 +148 @@
 
     // Otherwise, add the interval ending now to elapsed time.
-    double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
+    double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
     double newlyElapsedTime = currentTime() - last.startTime();
     last.setElapsedTime(previousElapsedTime + newlyElapsedTime);
@@ -226 +226 @@
 void ProfileGenerator::didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
 {
-    ASSERT(isnan(m_debuggerPausedTimestamp));
+    ASSERT(std::isnan(m_debuggerPausedTimestamp));
 
     m_debuggerPausedTimestamp = currentTime();
@@ -232 +232 @@
     for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent()) {
         ProfileNode::Call& last = node->lastCall();
-        ASSERT(!isnan(last.startTime()));
-
-        double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
+        ASSERT(!std::isnan(last.startTime()));
+
+        double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
         double additionalElapsedTime = m_debuggerPausedTimestamp - last.startTime();
         last.setStartTime(NAN);
@@ -243 +243 @@
 void ProfileGenerator::didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
 {
-    ASSERT(!isnan(m_debuggerPausedTimestamp));
+    ASSERT(!std::isnan(m_debuggerPausedTimestamp));
 
     for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent())