[Isolates] Merge from bleeding_edge, revisions 5934-6100.

src/runtime-profiler.h

 // Copyright 2010 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 22 matching lines @@
 
 namespace v8 {
 namespace internal {
 
 class Isolate;
 class JSFunction;
 class Object;
 class PendingListNode;
 class Semaphore;
 
+
+enum SamplerState {
+  IN_NON_JS_STATE = 0,
+  IN_JS_STATE = 1
+};
+
+
 class RuntimeProfiler {
  public:
   explicit RuntimeProfiler(Isolate* isolate);
 
   static bool IsEnabled();
 
   void OptimizeNow();
   void OptimizeSoon(JSFunction* function);
 
   void NotifyTick();
@@ skipping 29 matching lines @@
   static bool IsSomeIsolateInJS();
   static bool WaitForSomeIsolateToEnterJS();
 
   // When shutting down we join the profiler thread. Doing so while
   // it's waiting on a semaphore will cause a deadlock, so we have to
   // wake it up first.
   static void WakeUpRuntimeProfilerThreadBeforeShutdown();
 
  private:
   static const int kSamplerWindowSize = 16;
+  static const int kStateWindowSize = 128;
 
   static void HandleWakeUp(Isolate* isolate);
 
   void Optimize(JSFunction* function, bool eager, int delay);
 
   void AttemptOnStackReplacement(JSFunction* function);
 
   void ClearSampleBuffer();
 
   void ClearSampleBufferNewSpaceEntries();
 
   int LookupSample(JSFunction* function);
 
   void AddSample(JSFunction* function, int weight);
 
+#ifdef ENABLE_LOGGING_AND_PROFILING
+  void UpdateStateRatio(SamplerState current_state);
+#endif
+
   Isolate* isolate_;
 
   int sampler_threshold_;
   int sampler_threshold_size_factor_;
+  int sampler_ticks_until_threshold_adjustment_;
+
+  // The ratio of ticks spent in JS code in percent.
+  Atomic32 js_ratio_;
 
   // The JSFunctions in the sampler window are not GC safe. Old-space
   // pointers are not cleared during mark-sweep collection and therefore
   // the window might contain stale pointers. The window is updated on
   // scavenges and (parts of it) cleared on mark-sweep and
   // mark-sweep-compact.
   Object* sampler_window_[kSamplerWindowSize];
   int sampler_window_position_;
   int sampler_window_weight_[kSamplerWindowSize];
 
   // Support for pending 'optimize soon' requests.
   PendingListNode* optimize_soon_list_;
 
+  SamplerState state_window_[kStateWindowSize];
+  int state_window_position_;
+  int state_counts_[2];
+
   // Possible state values:
   //   -1            => the profiler thread is waiting on the semaphore
   //   0 or positive => the number of isolates running JavaScript code.
   static Atomic32 state_;
   static Semaphore* semaphore_;
 };
 
 
 // Rate limiter intended to be used in the profiler thread.
 class RuntimeProfilerRateLimiter BASE_EMBEDDED {
@@ skipping 31 matching lines @@
 
 void RuntimeProfiler::IsolateExitedJS(Isolate* isolate) {
   Atomic32 new_state = NoBarrier_AtomicIncrement(&state_, -1);
   ASSERT(new_state >= 0);
   USE(new_state);
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_RUNTIME_PROFILER_H_