Index: src/log.cc |
diff --git a/src/log.cc b/src/log.cc |
index 6d88a535dc78f4ce10ce7a578d56d1b7b32b4e7c..6262748203fd2ffddea02a220e76afe8290be19a 100644 |
--- a/src/log.cc |
+++ b/src/log.cc |
@@ -16,6 +16,7 @@ |
#include "src/log-utils.h" |
#include "src/macro-assembler.h" |
#include "src/runtime-profiler.h" |
+#include "src/sampler.h" |
#include "src/serialize.h" |
#include "src/string-stream.h" |
#include "src/vm-state-inl.h" |
@@ -23,7 +24,6 @@ |
namespace v8 { |
namespace internal { |
- |
#define DECLARE_EVENT(ignore1, name) name, |
static const char* const kLogEventsNames[Logger::NUMBER_OF_LOG_EVENTS] = { |
LOG_EVENTS_AND_TAGS_LIST(DECLARE_EVENT) |
@@ -1720,7 +1720,7 @@ void Logger::TickEvent(TickSample* sample, bool overflow) { |
} |
for (unsigned i = 0; i < sample->frames_count; ++i) { |
msg.Append(','); |
- msg.AppendAddress(sample->stack[i]); |
+ msg.AppendAddress(static_cast<Address>(sample->stack[i])); |
} |
msg.Append('\n'); |
msg.WriteToLogFile(); |
@@ -2060,6 +2060,11 @@ bool Logger::SetUp(Isolate* isolate) { |
profiler_->Engage(); |
} |
+ // This one's for the new sampler API. (include/v8.h) |
+ if (FLAG_new_sampler_api) { |
+ Sampler::SetUpForNewSamplingAPI(); |
+ } |
+ |
if (FLAG_log_internal_timer_events || FLAG_prof) timer_.Start(); |
return true; |