Log event start and event end separately when using --log-timer-events.

src/log.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 615 matching lines @@
   if (!log_->IsEnabled() || !FLAG_prof) return;
   LogMessageBuilder msg(this);
   msg.Append("shared-library,\"%ls\",0x%08" V8PRIxPTR ",0x%08" V8PRIxPTR "\n",
              library_path,
              start,
              end);
   msg.WriteToLogFile();
 }
 
 
-void Logger::TimerEvent(const char* name, int64_t start, int64_t end) {
+void Logger::TimerEvent(StartEnd se, const char* name) {
   if (!log_->IsEnabled()) return;
   ASSERT(FLAG_log_internal_timer_events);
   LogMessageBuilder msg(this);
-  int since_epoch = static_cast<int>(start - epoch_);
-  int pause_time = static_cast<int>(end - start);
-  msg.Append("timer-event,\"%s\",%ld,%ld\n", name, since_epoch, pause_time);
+  int since_epoch = static_cast<int>(OS::Ticks() - epoch_);
+  const char* format = (se == START) ? "timer-event-start,\"%s\",%ld\n"
+                                     : "timer-event-end,\"%s\",%ld\n";
+  msg.Append(format, name, since_epoch);
   msg.WriteToLogFile();
 }
 
 
-void Logger::ExternalSwitch(StateTag old_tag, StateTag new_tag) {
-  if (old_tag != EXTERNAL && new_tag == EXTERNAL) {
-    enter_external_ = OS::Ticks();
-  }
-  if (old_tag == EXTERNAL && new_tag != EXTERNAL && enter_external_ != 0) {
-    TimerEvent("V8.External", enter_external_, OS::Ticks());
-    enter_external_ = 0;
-  }
-}
-
-
 void Logger::EnterExternal() {
-  LOGGER->enter_external_ = OS::Ticks();
+  LOG(ISOLATE, TimerEvent(START, TimerEventScope::v8_external));
 }
 
 
 void Logger::LeaveExternal() {
-  if (enter_external_ == 0) return;
-  Logger* logger = LOGGER;
-  logger->TimerEvent("V8.External", enter_external_, OS::Ticks());
-  logger->enter_external_ = 0;
+  LOG(ISOLATE, TimerEvent(END, TimerEventScope::v8_external));
 }
 
 
-int64_t Logger::enter_external_ = 0;
-
-
-void Logger::TimerEventScope::LogTimerEvent() {
-  LOG(isolate_, TimerEvent(name_, start_, OS::Ticks()));
+void Logger::TimerEventScope::LogTimerEvent(StartEnd se) {
+  LOG(isolate_, TimerEvent(se, name_));
 }
 
 
 const char* Logger::TimerEventScope::v8_recompile_synchronous =
     "V8.RecompileSynchronous";
 const char* Logger::TimerEventScope::v8_recompile_parallel =
     "V8.RecompileParallel";
 const char* Logger::TimerEventScope::v8_compile_full_code =
     "V8.CompileFullCode";
 const char* Logger::TimerEventScope::v8_execute = "V8.Execute";
+const char* Logger::TimerEventScope::v8_external = "V8.External";
 
 
 void Logger::LogRegExpSource(Handle<JSRegExp> regexp) {
   // Prints "/" + re.source + "/" +
   //      (re.global?"g":"") + (re.ignorecase?"i":"") + (re.multiline?"m":"")
   LogMessageBuilder msg(this);
 
   Handle<Object> source = GetProperty(regexp, "source");
   if (!source->IsString()) {
     msg.Append("no source");
@@ skipping 1136 matching lines @@
 void SamplerRegistry::RemoveActiveSampler(Sampler* sampler) {
   ASSERT(sampler->IsActive());
   ScopedLock lock(active_samplers_mutex);
   ASSERT(active_samplers_ != NULL);
   bool removed = active_samplers_->RemoveElement(sampler);
   ASSERT(removed);
   USE(removed);
 }
 
 } }  // namespace v8::internal