1.1 --- a/src/share/vm/runtime/threadLocalStorage.hpp Fri Dec 04 14:31:14 2015 +0000
1.2 +++ b/src/share/vm/runtime/threadLocalStorage.hpp Mon Dec 07 13:25:13 2015 +0100
1.3 @@ -38,10 +38,14 @@
1.4 extern "C" uintptr_t _raw_thread_id();
1.5
1.6 class ThreadLocalStorage : AllStatic {
1.7 +
1.8 + // Exported API
1.9 public:
1.10 static void set_thread(Thread* thread);
1.11 static Thread* get_thread_slow();
1.12 static void invalidate_all() { pd_invalidate_all(); }
1.13 + static void init();
1.14 + static bool is_initialized();
1.15
1.16 // Machine dependent stuff
1.17 #ifdef TARGET_OS_ARCH_linux_x86
1.18 @@ -78,17 +82,12 @@
1.19 # include "threadLS_bsd_zero.hpp"
1.20 #endif
1.21
1.22 -
1.23 +#ifndef SOLARIS
1.24 public:
1.25 // Accessor
1.26 static inline int thread_index() { return _thread_index; }
1.27 static inline void set_thread_index(int index) { _thread_index = index; }
1.28
1.29 - // Initialization
1.30 - // Called explicitly from VMThread::activate_system instead of init_globals.
1.31 - static void init();
1.32 - static bool is_initialized();
1.33 -
1.34 private:
1.35 static int _thread_index;
1.36
1.37 @@ -97,6 +96,9 @@
1.38 // Processor dependent parts of set_thread and initialization
1.39 static void pd_set_thread(Thread* thread);
1.40 static void pd_init();
1.41 +
1.42 +#endif // SOLARIS
1.43 +
1.44 // Invalidate any thread cacheing or optimization schemes.
1.45 static void pd_invalidate_all();
1.46
