Revision: 4422
Author: [email protected]
Date: Wed Apr 14 11:48:05 2010
Log: merged
http://code.google.com/p/v8/source/detail?r=4422
Modified:
/branches/bleeding_edge/SConstruct
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/src/cpu-profiler-inl.h
/branches/bleeding_edge/src/cpu-profiler.cc
/branches/bleeding_edge/src/cpu-profiler.h
/branches/bleeding_edge/src/log-inl.h
/branches/bleeding_edge/src/log.h
/branches/bleeding_edge/src/platform-linux.cc
/branches/bleeding_edge/src/platform-macos.cc
/branches/bleeding_edge/src/platform-win32.cc
/branches/bleeding_edge/src/profile-generator-inl.h
/branches/bleeding_edge/src/profile-generator.cc
/branches/bleeding_edge/src/profile-generator.h
/branches/bleeding_edge/test/cctest/test-cpu-profiler.cc
/branches/bleeding_edge/test/cctest/test-profile-generator.cc
/branches/bleeding_edge/tools/gyp/v8.gyp
=======================================
--- /branches/bleeding_edge/SConstruct Wed Apr 14 00:49:30 2010
+++ /branches/bleeding_edge/SConstruct Wed Apr 14 11:48:05 2010
@@ -114,9 +114,6 @@
'profilingsupport:on': {
'CPPDEFINES':
['ENABLE_VMSTATE_TRACKING', 'ENABLE_LOGGING_AND_PROFILING'],
},
- 'cppprofilesprocessor:on': {
- 'CPPDEFINES': ['ENABLE_CPP_PROFILES_PROCESSOR'],
- },
'debuggersupport:on': {
'CPPDEFINES': ['ENABLE_DEBUGGER_SUPPORT'],
}
@@ -696,11 +693,6 @@
'default': 'on',
'help': 'enable profiling of JavaScript code'
},
- 'cppprofilesprocessor': {
- 'values': ['on', 'off'],
- 'default': 'on',
- 'help': 'enable C++ profiles processor'
- },
'debuggersupport': {
'values': ['on', 'off'],
'default': 'on',
=======================================
--- /branches/bleeding_edge/src/api.cc Tue Apr 13 10:00:33 2010
+++ /branches/bleeding_edge/src/api.cc Wed Apr 14 11:48:05 2010
@@ -4027,7 +4027,7 @@
#endif // ENABLE_DEBUGGER_SUPPORT
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
Handle<String> CpuProfileNode::GetFunctionName() const {
IsDeadCheck("v8::CpuProfileNode::GetFunctionName");
@@ -4148,7 +4148,7 @@
i::CpuProfiler::StopProfiling(*Utils::OpenHandle(*title)));
}
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
namespace internal {
=======================================
--- /branches/bleeding_edge/src/cpu-profiler-inl.h Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/cpu-profiler-inl.h Wed Apr 14 11:48:05 2010
@@ -30,7 +30,7 @@
#include "cpu-profiler.h"
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "circular-queue-inl.h"
#include "profile-generator-inl.h"
@@ -93,6 +93,6 @@
} } // namespace v8::internal
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
#endif // V8_CPU_PROFILER_INL_H_
=======================================
--- /branches/bleeding_edge/src/cpu-profiler.cc Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/cpu-profiler.cc Wed Apr 14 11:48:05 2010
@@ -29,7 +29,7 @@
#include "cpu-profiler-inl.h"
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "log-inl.h"
@@ -466,13 +466,13 @@
} } // namespace v8::internal
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
namespace v8 {
namespace internal {
void CpuProfiler::Setup() {
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
if (singleton_ == NULL) {
singleton_ = new CpuProfiler();
}
@@ -481,7 +481,7 @@
void CpuProfiler::TearDown() {
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
if (singleton_ != NULL) {
delete singleton_;
}
=======================================
--- /branches/bleeding_edge/src/cpu-profiler.h Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/cpu-profiler.h Wed Apr 14 11:48:05 2010
@@ -28,7 +28,7 @@
#ifndef V8_CPU_PROFILER_H_
#define V8_CPU_PROFILER_H_
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "circular-queue.h"
@@ -197,7 +197,7 @@
} while (false)
#else
#define PROFILE(Call) LOG(Call)
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
namespace v8 {
@@ -208,7 +208,7 @@
static void Setup();
static void TearDown();
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
static void StartProfiling(const char* title);
static void StartProfiling(String* title);
static CpuProfile* StopProfiling(const char* title);
@@ -265,7 +265,7 @@
#else
static INLINE(bool is_profiling()) { return false; }
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
private:
DISALLOW_COPY_AND_ASSIGN(CpuProfiler);
=======================================
--- /branches/bleeding_edge/src/log-inl.h Thu Apr 8 06:37:39 2010
+++ /branches/bleeding_edge/src/log-inl.h Wed Apr 14 11:48:05 2010
@@ -38,7 +38,6 @@
Logger::LogEventsAndTags Logger::ToNativeByScript(Logger::LogEventsAndTags
tag,
Script* script) {
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
if ((tag == FUNCTION_TAG || tag == LAZY_COMPILE_TAG || tag == SCRIPT_TAG)
&& script->type()->value() == Script::TYPE_NATIVE) {
switch (tag) {
@@ -50,9 +49,6 @@
} else {
return tag;
}
-#else
- return tag;
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
}
#endif // ENABLE_LOGGING_AND_PROFILING
=======================================
--- /branches/bleeding_edge/src/log.h Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/log.h Wed Apr 14 11:48:05 2010
@@ -87,7 +87,7 @@
#define LOG(Call) ((void) 0)
#endif
-#define LOG_EVENTS_AND_TAGS_LIST_NO_NATIVES(V) \
+#define LOG_EVENTS_AND_TAGS_LIST(V) \
V(CODE_CREATION_EVENT, "code-creation", "cc") \
V(CODE_MOVE_EVENT, "code-move", "cm") \
V(CODE_DELETE_EVENT, "code-delete", "cd") \
@@ -116,19 +116,13 @@
V(REG_EXP_TAG, "RegExp", "re") \
V(SCRIPT_TAG, "Script", "sc") \
V(STORE_IC_TAG, "StoreIC", "sic") \
- V(STUB_TAG, "Stub", "s")
-
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
-// Add 'NATIVE_' cases for functions and scripts, but map them to
-// original tags when writing to the log.
-#define LOG_EVENTS_AND_TAGS_LIST(V) \
- LOG_EVENTS_AND_TAGS_LIST_NO_NATIVES(V) \
+ V(STUB_TAG, "Stub", "s") \
V(NATIVE_FUNCTION_TAG, "Function", "f") \
V(NATIVE_LAZY_COMPILE_TAG, "LazyCompile", "lc") \
V(NATIVE_SCRIPT_TAG, "Script", "sc")
-#else
-#define LOG_EVENTS_AND_TAGS_LIST(V) LOG_EVENTS_AND_TAGS_LIST_NO_NATIVES(V)
-#endif
+// Note that 'NATIVE_' cases for functions and scripts are mapped onto
+// original tags when writing to the log.
+
class Logger {
public:
=======================================
--- /branches/bleeding_edge/src/platform-linux.cc Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/platform-linux.cc Wed Apr 14 11:48:05 2010
@@ -728,10 +728,7 @@
if (active_sampler_ == NULL) return;
TickSample sample_obj;
- TickSample* sample = NULL;
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
- sample = CpuProfiler::TickSampleEvent();
-#endif
+ TickSample* sample = CpuProfiler::TickSampleEvent();
if (sample == NULL) sample = &sample_obj;
// We always sample the VM state.
=======================================
--- /branches/bleeding_edge/src/platform-macos.cc Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/platform-macos.cc Wed Apr 14 11:48:05 2010
@@ -547,10 +547,7 @@
// Loop until the sampler is disengaged, keeping the specified samling
freq.
for ( ; sampler_->IsActive(); OS::Sleep(sampler_->interval_)) {
TickSample sample_obj;
- TickSample* sample = NULL;
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
- sample = CpuProfiler::TickSampleEvent();
-#endif
+ TickSample* sample = CpuProfiler::TickSampleEvent();
if (sample == NULL) sample = &sample_obj;
// We always sample the VM state.
=======================================
--- /branches/bleeding_edge/src/platform-win32.cc Mon Apr 12 00:23:43 2010
+++ /branches/bleeding_edge/src/platform-win32.cc Wed Apr 14 11:48:05 2010
@@ -1806,10 +1806,7 @@
// Loop until the sampler is disengaged, keeping the specified samling
freq.
for ( ; sampler_->IsActive(); Sleep(sampler_->interval_)) {
TickSample sample_obj;
- TickSample* sample = NULL;
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
- sample = CpuProfiler::TickSampleEvent();
-#endif
+ TickSample* sample = CpuProfiler::TickSampleEvent();
if (sample == NULL) sample = &sample_obj;
// We always sample the VM state.
=======================================
--- /branches/bleeding_edge/src/profile-generator-inl.h Wed Apr 7 07:18:26
2010
+++ /branches/bleeding_edge/src/profile-generator-inl.h Wed Apr 14 11:48:05
2010
@@ -28,7 +28,7 @@
#ifndef V8_PROFILE_GENERATOR_INL_H_
#define V8_PROFILE_GENERATOR_INL_H_
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "profile-generator.h"
@@ -118,6 +118,6 @@
} } // namespace v8::internal
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
#endif // V8_PROFILE_GENERATOR_INL_H_
=======================================
--- /branches/bleeding_edge/src/profile-generator.cc Tue Apr 13 04:59:37
2010
+++ /branches/bleeding_edge/src/profile-generator.cc Wed Apr 14 11:48:05
2010
@@ -25,7 +25,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "v8.h"
@@ -522,4 +522,4 @@
} } // namespace v8::internal
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
=======================================
--- /branches/bleeding_edge/src/profile-generator.h Wed Apr 7 07:18:26 2010
+++ /branches/bleeding_edge/src/profile-generator.h Wed Apr 14 11:48:05 2010
@@ -28,7 +28,7 @@
#ifndef V8_PROFILE_GENERATOR_H_
#define V8_PROFILE_GENERATOR_H_
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "hashmap.h"
@@ -304,6 +304,6 @@
} } // namespace v8::internal
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
#endif // V8_PROFILE_GENERATOR_H_
=======================================
--- /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Tue Apr 13
04:59:37 2010
+++ /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Wed Apr 14
11:48:05 2010
@@ -2,7 +2,7 @@
//
// Tests of profiles generator and utilities.
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "v8.h"
#include "cpu-profiler-inl.h"
@@ -222,4 +222,4 @@
CHECK_EQ("bbb", bottom_up_ddd_stub_children->last()->entry()->name());
}
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
=======================================
--- /branches/bleeding_edge/test/cctest/test-profile-generator.cc Mon Apr
12 00:23:43 2010
+++ /branches/bleeding_edge/test/cctest/test-profile-generator.cc Wed Apr
14 11:48:05 2010
@@ -2,7 +2,7 @@
//
// Tests of profiles generator and utilities.
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
+#ifdef ENABLE_LOGGING_AND_PROFILING
#include "v8.h"
#include "profile-generator-inl.h"
@@ -443,4 +443,4 @@
CHECK_EQ(entry1, node4->entry());
}
-#endif // ENABLE_CPP_PROFILES_PROCESSOR
+#endif // ENABLE_LOGGING_AND_PROFILING
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Mon Apr 12 00:52:40 2010
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Wed Apr 14 11:48:05 2010
@@ -38,7 +38,6 @@
'ENABLE_LOGGING_AND_PROFILING',
'ENABLE_DEBUGGER_SUPPORT',
'ENABLE_VMSTATE_TRACKING',
- 'ENABLE_CPP_PROFILES_PROCESSOR',
],
'conditions': [
['target_arch=="arm"', {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
To unsubscribe, reply using "remove me" as the subject.
