Merge revision 3813 to 3930 from bleeding_edge to partial snapshots branch.

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 143 matching lines @@
 
   // Acquires resources for logging if the right flags are set.
   static bool Setup();
 
   // Frees resources acquired in Setup.
   static void TearDown();
 
   // Enable the computation of a sliding window of states.
   static void EnableSlidingStateWindow();
 
-  // Write a raw string to the log to be used as a preamble.
-  // No check is made that the 'preamble' is actually at the beginning
-  // of the log. The preample is used to write code events saved in the
-  // snapshot.
-  static void Preamble(const char* content);
-
   // Emits an event with a string value -> (name, value).
   static void StringEvent(const char* name, const char* value);
 
   // Emits an event with an int value -> (name, value).
   static void IntEvent(const char* name, int value);
 
   // Emits an event with an handle value -> (name, location).
   static void HandleEvent(const char* name, Object** location);
 
   // Emits memory management events for C allocated structures.
@@ skipping 90 matching lines @@
     return current_state_ ? current_state_->state() : OTHER;
   }
 
   static bool is_logging() {
     return is_logging_;
   }
 
   // Pause/Resume collection of profiling data.
   // When data collection is paused, CPU Tick events are discarded until
   // data collection is Resumed.
-  static void PauseProfiler(int flags);
-  static void ResumeProfiler(int flags);
+  static void PauseProfiler(int flags, int tag);
+  static void ResumeProfiler(int flags, int tag);
   static int GetActiveProfilerModules();
 
   // If logging is performed into a memory buffer, allows to
   // retrieve previously written messages. See v8.h.
   static int GetLogLines(int from_pos, char* dest_buf, int max_size);
 
   // Logs all compiled functions found in the heap.
   static void LogCompiledFunctions();
   // Logs all compiled JSFunction objects found in the heap.
   static void LogFunctionObjects();
@@ skipping 80 matching lines @@
   friend class EventLog;
   friend class TimeLog;
   friend class Profiler;
   friend class SlidingStateWindow;
   friend class StackTracer;
   friend class VMState;
 
   friend class LoggerTestHelper;
 
   static bool is_logging_;
+  static int cpu_profiler_nesting_;
+  static int heap_profiler_nesting_;
 #else
   static bool is_logging() { return false; }
 #endif
 };
 
 
 // Class that extracts stack trace, used for profiling.
 class StackTracer : public AllStatic {
  public:
   static void Trace(TickSample* sample);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_LOG_H_