src/share/vm/runtime/thread.hpp

*** 710,719 ****
--- 710,720 ----
    virtual void run();
  
   private:
    static WatcherThread* _watcher_thread;
  
+   static bool _startable;
    volatile static bool _should_terminate; // updated without holding lock
   public:
    enum SomeConstants {
      delay_interval = 10                          // interrupt delay in milliseconds
    };
*** 726,742 ****
--- 727,750 ----
  
    // Printing
    char* name() const { return (char*)"VM Periodic Task Thread"; }
    void print_on(outputStream* st) const;
    void print() const { print_on(tty); }
+   void unpark();
  
    // Returns the single instance of WatcherThread
    static WatcherThread* watcher_thread()         { return _watcher_thread; }
  
    // Create and start the single instance of WatcherThread, or stop it on shutdown
    static void start();
    static void stop();
+   // Only allow start once the VM is sufficiently initialized
+   // Otherwise the first task to enroll will trigger the start
+   static void make_startable();
+ 
+  private:
+   jint sleep() const;
  };
  
  
  class CompilerThread;