Changeset 34960 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 2, 2008, 3:50:17 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-02 Kevin McCullough <​[email protected]>

Reviewed by Darin.

<rdar://problem/5951532> JSProfiler: Implement Bottom-Up view (19228)

• Subclass TreeProfile as I prepare for a HeavyProfile to be comming later.

• JavaScriptCore.xcodeproj/project.pbxproj:
• profiler/Profile.cpp: By default we create a TreeProfile. (KJS::Profile::create):
• profiler/Profile.h: Changes to the Profile class to make it amenable to be inherited from. (KJS::Profile::~Profile):
• profiler/TreeProfile.cpp: Added. (KJS::TreeProfile::create): (KJS::TreeProfile::TreeProfile): (KJS::TreeProfile::heavyProfile):
• profiler/TreeProfile.h: Added. (KJS::TreeProfile::treeProfile):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• profiler/Profile.cpp (modified) (3 diffs)
• profiler/Profile.h (modified) (3 diffs)
• profiler/TreeProfile.cpp (added)
• profiler/TreeProfile.h (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-07-02  Kevin McCullough  <[email protected]>
+
+        Reviewed by Darin.
+
+        <rdar://problem/5951532> JSProfiler: Implement Bottom-Up view (19228)
+        - Subclass TreeProfile as I prepare for a HeavyProfile to be comming
+        later.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * profiler/Profile.cpp: By default we create a TreeProfile.
+        (KJS::Profile::create):
+        * profiler/Profile.h: Changes to the Profile class to make it amenable
+        to be inherited from.
+        (KJS::Profile::~Profile):
+        * profiler/TreeProfile.cpp: Added.
+        (KJS::TreeProfile::create):
+        (KJS::TreeProfile::TreeProfile):
+        (KJS::TreeProfile::heavyProfile):
+        * profiler/TreeProfile.h: Added.
+        (KJS::TreeProfile::treeProfile):
+
 2008-07-02  Kevin McCullough  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -87 +87 @@
                 95AB83420DA4322500BC83F3 /* Profiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95AB832E0DA42CAD00BC83F3 /* Profiler.cpp */; };
                 95AB83560DA43C3000BC83F3 /* ProfileNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95AB83540DA43B4400BC83F3 /* ProfileNode.cpp */; };
+                95CD41B30E1BF6560085358E /* TreeProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95CD41B10E1BF6560085358E /* TreeProfile.cpp */; };
+                95CD41B40E1BF6560085358E /* TreeProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 95CD41B20E1BF6560085358E /* TreeProfile.h */; };
                 95E3BC050E1AE68200B2D1C1 /* CallIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 95E3BC040E1AE68200B2D1C1 /* CallIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A72700900DAC6BBC00E548D7 /* JSNotAnObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A72700780DAC605600E548D7 /* JSNotAnObject.cpp */; };
@@ -578 +580 @@
                 95AB83550DA43B4400BC83F3 /* ProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfileNode.h; path = profiler/ProfileNode.h; sourceTree = "<group>"; };
                 95C18D3E0C90E7EF00E72F73 /* JSRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRetainPtr.h; sourceTree = "<group>"; };
+                95CD41B10E1BF6560085358E /* TreeProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TreeProfile.cpp; path = profiler/TreeProfile.cpp; sourceTree = "<group>"; };
+                95CD41B20E1BF6560085358E /* TreeProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TreeProfile.h; path = profiler/TreeProfile.h; sourceTree = "<group>"; };
                 95E3BC040E1AE68200B2D1C1 /* CallIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CallIdentifier.h; path = profiler/CallIdentifier.h; sourceTree = "<group>"; };
                 A72700770DAC605600E548D7 /* JSNotAnObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNotAnObject.h; sourceTree = "<group>"; };
@@ -1208 +1212 @@
                         isa = PBXGroup;
                         children = (
+                                95CD41B10E1BF6560085358E /* TreeProfile.cpp */,
+                                95CD41B20E1BF6560085358E /* TreeProfile.h */,
                                 95E3BC040E1AE68200B2D1C1 /* CallIdentifier.h */,
                                 95AB83540DA43B4400BC83F3 /* ProfileNode.cpp */,
@@ -1426 +1432 @@
                                 BC1167DA0E19BCC9008066DD /* JSCell.h in Headers */,
                                 BC7F8FB90E19D1C3008632C0 /* JSNumberCell.h in Headers */,
+                                95CD41B40E1BF6560085358E /* TreeProfile.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1709 +1716 @@
                                 149559EE0DDCDDF700648087 /* DebuggerCallFrame.cpp in Sources */,
                                 E18E3A590DF9278C00D90B34 /* JSGlobalData.cpp in Sources */,
+                                95CD41B30E1BF6560085358E /* TreeProfile.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -27 +27 @@
 #include "Profile.h"
 
-#include "ProfileNode.h"
-#include "JSGlobalObject.h"
 #include "ExecState.h"
 #include "JSFunction.h"
+#include "JSGlobalObject.h"
+#include "ProfileNode.h"
+#include "TreeProfile.h"
 
 #include <stdio.h>
@@ -40 +41 @@
 PassRefPtr<Profile> Profile::create(const UString& title, ExecState* originatingGlobalExec, unsigned pageGroupIdentifier, ProfilerClient* client)
 {
-    return adoptRef(new Profile(title, originatingGlobalExec, pageGroupIdentifier, client));
+    return TreeProfile::create(title, originatingGlobalExec, pageGroupIdentifier, client);
 }
 
@@ -57 +58 @@
 }
 
+Profile::~Profile()
+{
+}
+
 void Profile::stopProfiling()
 {

trunk/JavaScriptCore/profiler/Profile.h

@@ -39 +39 @@
     public:
         static PassRefPtr<Profile> create(const UString& title, ExecState* originatingGlobalExec, unsigned pageGroupIdentifier, ProfilerClient*);
+        virtual ~Profile();
 
         void willExecute(const CallIdentifier&);
@@ -70 +71 @@
         bool stoppedProfiling() { return m_stoppedProfiling; }
 
+        virtual Profile* heavyProfile() = 0;
+        virtual Profile* treeProfile() = 0; 
+
 #ifndef NDEBUG
         void debugPrintData() const;
@@ -76 +80 @@
         typedef void (Profile::*ProfileFunction)(const CallIdentifier& callIdentifier);
 
-    private:
+    protected:
         Profile(const UString& title, ExecState* originatingGlobalExec, unsigned pageGroupIdentifier, ProfilerClient*);
 
+    private:
         void removeProfileStart();
         void removeProfileEnd();