| Index: src/log.cc
|
| diff --git a/src/log.cc b/src/log.cc
|
| index bf44cc05eebd6e0437afd1c81e5ec5b3479fab36..6c07758ef7b634fdd026c8bbe8ba1486248b9143 100644
|
| --- a/src/log.cc
|
| +++ b/src/log.cc
|
| @@ -526,7 +526,6 @@ Logger::Logger()
|
| name_buffer_(new NameBuffer),
|
| address_to_name_map_(NULL),
|
| is_initialized_(false),
|
| - code_event_handler_(NULL),
|
| last_address_(NULL),
|
| prev_sp_(NULL),
|
| prev_function_(NULL),
|
| @@ -542,50 +541,6 @@ Logger::~Logger() {
|
| }
|
|
|
|
|
| -void Logger::IssueCodeAddedEvent(Code* code,
|
| - const char* name,
|
| - size_t name_len) {
|
| - JitCodeEvent event;
|
| - event.type = JitCodeEvent::CODE_ADDED;
|
| - event.code_start = code->instruction_start();
|
| - event.code_len = code->instruction_size();
|
| - event.name.str = name;
|
| - event.name.len = name_len;
|
| -
|
| - code_event_handler_(&event);
|
| -}
|
| -
|
| -
|
| -void Logger::IssueCodeMovedEvent(Address from, Address to) {
|
| - Code* from_code = Code::cast(HeapObject::FromAddress(from));
|
| -
|
| - JitCodeEvent event;
|
| - event.type = JitCodeEvent::CODE_MOVED;
|
| - event.code_start = from_code->instruction_start();
|
| - event.code_len = from_code->instruction_size();
|
| -
|
| - // Calculate the header size.
|
| - const size_t header_size =
|
| - from_code->instruction_start() - reinterpret_cast<byte*>(from_code);
|
| -
|
| - event.new_code_start = to + header_size;
|
| -
|
| - code_event_handler_(&event);
|
| -}
|
| -
|
| -
|
| -void Logger::IssueCodeRemovedEvent(Address from) {
|
| - Code* from_code = Code::cast(HeapObject::FromAddress(from));
|
| -
|
| - JitCodeEvent event;
|
| - event.type = JitCodeEvent::CODE_REMOVED;
|
| - event.code_start = from_code->instruction_start();
|
| - event.code_len = from_code->instruction_size();
|
| -
|
| - code_event_handler_(&event);
|
| -}
|
| -
|
| -
|
| #define DECLARE_EVENT(ignore1, name) name,
|
| static const char* const kLogEventsNames[Logger::NUMBER_OF_LOG_EVENTS] = {
|
| LOG_EVENTS_AND_TAGS_LIST(DECLARE_EVENT)
|
| @@ -909,17 +864,13 @@ void Logger::SetterCallbackEvent(String* name, Address entry_point) {
|
| void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| Code* code,
|
| const char* comment) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[tag]);
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendBytes(comment);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -948,17 +899,13 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| Code* code,
|
| String* name) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[tag]);
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendString(name);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -993,18 +940,14 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| Code* code,
|
| SharedFunctionInfo* shared,
|
| String* name) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[tag]);
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendBytes(ComputeMarker(code));
|
| name_buffer_->AppendString(name);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -1038,8 +981,8 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| Code* code,
|
| SharedFunctionInfo* shared,
|
| String* source, int line) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[tag]);
|
| name_buffer_->AppendByte(':');
|
| @@ -1050,10 +993,6 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendInt(line);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -1083,17 +1022,13 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
|
|
|
|
|
| void Logger::CodeCreateEvent(LogEventsAndTags tag, Code* code, int args_count) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[tag]);
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendInt(args_count);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -1120,17 +1055,13 @@ void Logger::CodeMovingGCEvent() {
|
|
|
|
|
| void Logger::RegExpCodeCreateEvent(Code* code, String* source) {
|
| - if (!is_logging_code_events()) return;
|
| - if (FLAG_ll_prof || Serializer::enabled() || code_event_handler_ != NULL) {
|
| + if (!log_->IsEnabled()) return;
|
| + if (FLAG_ll_prof || Serializer::enabled()) {
|
| name_buffer_->Reset();
|
| name_buffer_->AppendBytes(kLogEventsNames[REG_EXP_TAG]);
|
| name_buffer_->AppendByte(':');
|
| name_buffer_->AppendString(source);
|
| }
|
| - if (code_event_handler_ != NULL) {
|
| - IssueCodeAddedEvent(code, name_buffer_->get(), name_buffer_->size());
|
| - }
|
| - if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) {
|
| LowLevelCodeCreateEvent(code, name_buffer_->get(), name_buffer_->size());
|
| }
|
| @@ -1152,7 +1083,6 @@ void Logger::RegExpCodeCreateEvent(Code* code, String* source) {
|
|
|
|
|
| void Logger::CodeMoveEvent(Address from, Address to) {
|
| - if (code_event_handler_ != NULL) IssueCodeMovedEvent(from, to);
|
| if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) LowLevelCodeMoveEvent(from, to);
|
| if (Serializer::enabled() && address_to_name_map_ != NULL) {
|
| @@ -1163,7 +1093,6 @@ void Logger::CodeMoveEvent(Address from, Address to) {
|
|
|
|
|
| void Logger::CodeDeleteEvent(Address from) {
|
| - if (code_event_handler_ != NULL) IssueCodeRemovedEvent(from);
|
| if (!log_->IsEnabled()) return;
|
| if (FLAG_ll_prof) LowLevelCodeDeleteEvent(from);
|
| if (Serializer::enabled() && address_to_name_map_ != NULL) {
|
| @@ -1463,7 +1392,7 @@ static int EnumerateCompiledFunctions(Handle<SharedFunctionInfo>* sfis,
|
|
|
|
|
| void Logger::LogCodeObject(Object* object) {
|
| - if (FLAG_log_code || FLAG_ll_prof || is_logging_code_events()) {
|
| + if (FLAG_log_code || FLAG_ll_prof) {
|
| Code* code_object = Code::cast(object);
|
| LogEventsAndTags tag = Logger::STUB_TAG;
|
| const char* description = "Unknown code from the snapshot";
|
| @@ -1747,18 +1676,6 @@ bool Logger::SetUp() {
|
| }
|
|
|
|
|
| -void Logger::SetCodeEventHandler(uint32_t options,
|
| - JitCodeEventHandler event_handler) {
|
| - code_event_handler_ = event_handler;
|
| -
|
| - if (code_event_handler_ != NULL && (options & kJitCodeEventEnumExisting)) {
|
| - HandleScope scope;
|
| - LogCodeObjects();
|
| - LogCompiledFunctions();
|
| - }
|
| -}
|
| -
|
| -
|
| Sampler* Logger::sampler() {
|
| return ticker_;
|
| }
|
|
|