JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / profiler / Profile.cpp

diff --git a/profiler/Profile.cpp b/profiler/Profile.cpp
index de75e71c614e48507af6ce8a0c065e6c55badfc8..b5e022420aa574e53ce6bccf61974126fb21fe72 100644 (file)
--- a/profiler/Profile.cpp
+++ b/profiler/Profile.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All Rights Reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -27,22 +27,23 @@
 #include "Profile.h"
 
 #include "ProfileNode.h"
 #include "Profile.h"
 
 #include "ProfileNode.h"

-#include <stdio.h>
+#include <wtf/DataLog.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

-PassRefPtr<Profile> Profile::create(const UString& title, unsigned uid)
+PassRefPtr<Profile> Profile::create(const String& title, unsigned uid)

 {
     return adoptRef(new Profile(title, uid));
 }
 
 {
     return adoptRef(new Profile(title, uid));
 }
 

-Profile::Profile(const UString& title, unsigned uid)
+Profile::Profile(const String& title, unsigned uid)

     : m_title(title)
     , m_uid(uid)
     : m_title(title)
     , m_uid(uid)

+    , m_idleTime(0)

 {
     // FIXME: When multi-threading is supported this will be a vector and calls
     // into the profiler will need to know which thread it is executing on.
 {
     // FIXME: When multi-threading is supported this will be a vector and calls
     // into the profiler will need to know which thread it is executing on.

-    m_head = ProfileNode::create(CallIdentifier("Thread_1", 0, 0), 0, 0);
+    m_head = ProfileNode::create(0, CallIdentifier("Thread_1", String(), 0, 0), 0, 0);

 }
 
 Profile::~Profile()
 }
 
 Profile::~Profile()


@@ -65,52 +66,18 @@ void Profile::forEach(void (ProfileNode::*function)())
     } 
 }
 
     } 
 }
 

-void Profile::focus(const ProfileNode* profileNode)
-{
-    if (!profileNode || !m_head)
-        return;
-
-    bool processChildren;
-    const CallIdentifier& callIdentifier = profileNode->callIdentifier();
-    for (ProfileNode* currentNode = m_head.get(); currentNode; currentNode = currentNode->traverseNextNodePreOrder(processChildren))
-        processChildren = currentNode->focus(callIdentifier);
-
-    // Set the visible time of all nodes so that the %s display correctly.
-    forEach(&ProfileNode::calculateVisibleTotalTime);
-}
-
-void Profile::exclude(const ProfileNode* profileNode)
-{
-    if (!profileNode || !m_head)
-        return;
-
-    const CallIdentifier& callIdentifier = profileNode->callIdentifier();
-
-    for (ProfileNode* currentNode = m_head.get(); currentNode; currentNode = currentNode->traverseNextNodePreOrder())
-        currentNode->exclude(callIdentifier);
-
-    // Set the visible time of the head so the %s display correctly.
-    m_head->setVisibleTotalTime(m_head->totalTime() - m_head->selfTime());
-    m_head->setVisibleSelfTime(0.0);
-}
-
-void Profile::restoreAll()
-{
-    forEach(&ProfileNode::restore);
-}
-

 #ifndef NDEBUG
 void Profile::debugPrintData() const
 {
 #ifndef NDEBUG
 void Profile::debugPrintData() const
 {

-    printf("Call graph:\n");
+    dataLogF("Call graph:\n");

     m_head->debugPrintData(0);
 }
 
     m_head->debugPrintData(0);
 }
 

-typedef pair<UString::Rep*, unsigned> NameCountPair;
+typedef WTF::KeyValuePair<FunctionCallHashCount::ValueType, unsigned> NameCountPair;

 
 static inline bool functionNameCountPairComparator(const NameCountPair& a, const NameCountPair& b)
 {
 
 static inline bool functionNameCountPairComparator(const NameCountPair& a, const NameCountPair& b)
 {

-    return a.second > b.second;
+    return a.value > b.value;

 }
 
 void Profile::debugPrintDataSampleStyle() const
 }
 
 void Profile::debugPrintDataSampleStyle() const


@@ -118,18 +85,18 @@ void Profile::debugPrintDataSampleStyle() const
     typedef Vector<NameCountPair> NameCountPairVector;
 
     FunctionCallHashCount countedFunctions;
     typedef Vector<NameCountPair> NameCountPairVector;
 
     FunctionCallHashCount countedFunctions;

-    printf("Call graph:\n");
+    dataLogF("Call graph:\n");

     m_head->debugPrintDataSampleStyle(0, countedFunctions);
 
     m_head->debugPrintDataSampleStyle(0, countedFunctions);
 

-    printf("\nTotal number in stack:\n");
+    dataLogF("\nTotal number in stack:\n");

     NameCountPairVector sortedFunctions(countedFunctions.size());
     copyToVector(countedFunctions, sortedFunctions);
 
     std::sort(sortedFunctions.begin(), sortedFunctions.end(), functionNameCountPairComparator);
     for (NameCountPairVector::iterator it = sortedFunctions.begin(); it != sortedFunctions.end(); ++it)
     NameCountPairVector sortedFunctions(countedFunctions.size());
     copyToVector(countedFunctions, sortedFunctions);
 
     std::sort(sortedFunctions.begin(), sortedFunctions.end(), functionNameCountPairComparator);
     for (NameCountPairVector::iterator it = sortedFunctions.begin(); it != sortedFunctions.end(); ++it)

-        printf("        %-12d%s\n", (*it).second, UString((*it).first).UTF8String().c_str());
+        dataLogF("        %-12d%s\n", (*it).value, String((*it).key).utf8().data());

 
 

-    printf("\nSort by top of stack, same collapsed (when >= 5):\n");
+    dataLogF("\nSort by top of stack, same collapsed (when >= 5):\n");

 }
 #endif
 
 }
 #endif