Changeset 35454 in webkit for trunk/JavaScriptCore/kjs/Shell.cpp

Timestamp:

Jul 30, 2008, 10:38:35 AM (17 years ago)

Author:

[email protected]

Message:

2008-07-30 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Fixes for Windows and non-AllInOne file build with SamplingTool, plus review fixes.

• GNUmakefile.am: Adding SamplingTool.cpp to build.
• JavaScriptCore.exp: Export hooks to init & control SamplingTool.
• JavaScriptCore.pri: Adding SamplingTool.cpp to build.
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Adding SamplingTool.cpp to build.
• JavaScriptCore.xcodeproj/project.pbxproj: Adding SamplingTool.cpp to build.
• JavaScriptCoreSources.bkl: Adding SamplingTool.cpp to build.
• VM/Machine.cpp: MACHINE_SAMPLING_callingNativeFunction renamed MACHINE_SAMPLING_callingHostFunction
• VM/Machine.h:
• VM/Opcode.cpp: SamplingTool moved to SamplingTool.cpp/.h, opcodeNames generated from FOR_EACH_OPCODE_ID.
• VM/Opcode.h:
• VM/SamplingTool.cpp: Added .cpp/.h for SamplingTool.
• VM/SamplingTool.h:
• kjs/Shell.cpp: Switched SAMPLING_TOOL_ENABLED to ENABLE_SAMPLING_TOOL.
• wtf/Platform.h: Added ENABLE_SAMPLING_TOOL config option.
• kjs/nodes.cpp: Header include to fix non-AllInOne builds.

File:

• trunk/JavaScriptCore/kjs/Shell.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -35 +35 @@
 #include "Parser.h"
 #include "PrototypeFunction.h"
+#include "SamplingTool.h"
 #include "collector.h"
 #include "completion.h"
@@ -340 +341 @@
             prettyPrintScript(globalObject->globalExec(), fileName, script);
         else {
-#if SAMPLING_TOOL_ENABLED
+#if ENABLE(SAMPLING_TOOL)
             Machine* machine = globalObject->globalData()->machine;
             machine->m_sampler = new SamplingTool();
@@ -355 +356 @@
             }
 
-#if SAMPLING_TOOL_ENABLED
+#if ENABLE(SAMPLING_TOOL)
             machine->m_sampler->stop();
             machine->m_sampler->dump(globalObject->globalExec());