*** old/src/share/vm/runtime/sweeper.hpp	Mon Apr 14 10:01:27 2014
--- new/src/share/vm/runtime/sweeper.hpp	Mon Apr 14 10:01:26 2014

*** 56,66 ****
--- 56,67 ----
  class NMethodSweeper : public AllStatic {
    static long      _traversals;                   // Stack scan count, also sweep ID.
    static long      _total_nof_code_cache_sweeps;  // Total number of full sweeps of the code cache
    static long      _time_counter;                 // Virtual time used to periodically invoke sweeper
    static long      _last_sweep;                   // Value of _time_counter when the last sweep happened
!   static nmethod*  _current;                        // Current nmethod
!   static nmethod*  _current_nmethod;              // Current nmethod
+   static int       _current_type;                 // Current CodeBlobType
    static int       _seen;                         // Nof. nmethod we have currently processed in current pass of CodeCache
    static int       _flushed_count;                // Nof. nmethods flushed in current sweep
    static int       _zombified_count;              // Nof. nmethods made zombie in current sweep
    static int       _marked_for_reclamation_count; // Nof. nmethods marked for reclaim in current sweep
  

*** 80,90 ****
--- 81,91 ----
    static Tickspan  _total_time_sweeping;          // Accumulated time sweeping
    static Tickspan  _total_time_this_sweep;        // Total time this sweep
    static Tickspan  _peak_sweep_time;              // Peak time for a full sweep
    static Tickspan  _peak_sweep_fraction_time;     // Peak time sweeping one fraction
  
!   static int  process_nmethod(nmethod *nm, int code_blob_type);
    static void release_nmethod(nmethod* nm);
  
    static bool sweep_in_progress();
    static void sweep_code_cache();
  

*** 96,115 ****
--- 97,117 ----
    static const Tickspan peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
    static void log_sweep(const char* msg, const char* format = NULL, ...);
  
  
  #ifdef ASSERT
!   static bool is_sweeping(nmethod* which) { return _current_nmethod == which; }
    // Keep track of sweeper activity in the ring buffer
    static void record_sweep(nmethod* nm, int line);
    static void report_events(int id, address entry);
    static void report_events();
  #endif
  
    static void mark_active_nmethods();      // Invoked at the end of each safepoint
    static void possibly_sweep();            // Compiler threads call this to sweep
  
+   static int sort_nmethods_by_hotness(nmethod** nm1, nmethod** nm2);
    static int hotness_counter_reset_val();
    static void report_state_change(nmethod* nm);
    static void possibly_enable_sweeper();
    static void print();   // Printing/debugging
  };