Periodic merge from bleeding_edge to experimental code generator...

src/log.h

 // Copyright 2006-2008 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 54 matching lines @@
 // tick profiler requires code events, so --prof implies --log-code.
 
 // Forward declarations.
 class Ticker;
 class Profiler;
 class Semaphore;
 class SlidingStateWindow;
 
 #undef LOG
 #ifdef ENABLE_LOGGING_AND_PROFILING
-#define LOG(Call) v8::internal::Logger::Call
+#define LOG(Call)                           \
+  do {                                      \
+    if (v8::internal::Logger::is_enabled()) \
+      v8::internal::Logger::Call;           \
+  } while (false)
 #else
 #define LOG(Call) ((void) 0)
 #endif
 
 
 class VMState {
 #ifdef ENABLE_LOGGING_AND_PROFILING
  public:
   explicit VMState(StateTag state);
   ~VMState();
@@ skipping 96 matching lines @@
                                  unsigned end);
   static void SharedLibraryEvent(const wchar_t* library_path,
                                  unsigned start,
                                  unsigned end);
 
   // ==== Events logged by --log-regexp ====
   // Regexp compilation and execution events.
 
   static void RegExpCompileEvent(Handle<JSRegExp> regexp, bool in_cache);
 
-  static void RegExpExecEvent(Handle<JSRegExp> regexp,
-                              int start_index,
-                              Handle<String> input_string);
+  // Log an event reported from generated code
+  static void LogRuntime(Vector<const char> format, JSArray* args);
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   static StateTag state() {
     return current_state_ ? current_state_->state() : OTHER;
   }
 #endif
 
+  static bool is_enabled() { return logfile_ != NULL; }
+
 #ifdef ENABLE_LOGGING_AND_PROFILING
  private:
 
   // Emits the source code of a regexp. Used by regexp events.
   static void LogRegExpSource(Handle<JSRegExp> regexp);
 
-  static void LogString(Handle<String> str);
+  static void LogString(Handle<String> str, bool show_impl_info);
 
   // Emits a profiler tick event. Used by the profiler thread.
   static void TickEvent(TickSample* sample, bool overflow);
 
   static void ApiEvent(const char* name, ...);
 
   // When logging is active, logfile_ refers the file
   // events are written to.
   static FILE* logfile_;
 
@@ skipping 23 matching lines @@
   friend class Profiler;
   friend class SlidingStateWindow;
   friend class VMState;
 #endif
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_LOG_H_