src/hotspot/os/windows/os_windows.cpp

rev 52211 : [mq]: tinit

*** 418,427 ****
--- 418,430 ----
  
  LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo);
  
  // Thread start routine for all newly created threads
  static unsigned __stdcall thread_native_entry(Thread* thread) {
+ 
+   thread->record_stack_base_and_size();
+ 
    // Try to randomize the cache line index of hot stack frames.
    // This helps when threads of the same stack traces evict each other's
    // cache lines. The threads can be either from the same JVM instance, or
    // from different JVM instances. The benefit is especially true for
    // processors with hyperthreading technology.
*** 451,484 ****
  
    // Install a win32 structured exception handler around every thread created
    // by VM, so VM can generate error dump when an exception occurred in non-
    // Java thread (e.g. VM thread).
    __try {
!     thread->run();
    } __except(topLevelExceptionFilter(
                                       (_EXCEPTION_POINTERS*)_exception_info())) {
      // Nothing to do.
    }
  
    log_info(os, thread)("Thread finished (tid: " UINTX_FORMAT ").", os::current_thread_id());
  
    // One less thread is executing
    // When the VMThread gets here, the main thread may have already exited
    // which frees the CodeHeap containing the Atomic::add code
    if (thread != VMThread::vm_thread() && VMThread::vm_thread() != NULL) {
      Atomic::dec(&os::win32::_os_thread_count);
    }
  
-   // If a thread has not deleted itself ("delete this") as part of its
-   // termination sequence, we have to ensure thread-local-storage is
-   // cleared before we actually terminate. No threads should ever be
-   // deleted asynchronously with respect to their termination.
-   if (Thread::current_or_null_safe() != NULL) {
-     assert(Thread::current_or_null_safe() == thread, "current thread is wrong");
-     thread->clear_thread_current();
-   }
- 
    // Thread must not return from exit_process_or_thread(), but if it does,
    // let it proceed to exit normally
    return (unsigned)os::win32::exit_process_or_thread(os::win32::EPT_THREAD, res);
  }
  
--- 454,481 ----
  
    // Install a win32 structured exception handler around every thread created
    // by VM, so VM can generate error dump when an exception occurred in non-
    // Java thread (e.g. VM thread).
    __try {
!     thread->call_run();
    } __except(topLevelExceptionFilter(
                                       (_EXCEPTION_POINTERS*)_exception_info())) {
      // Nothing to do.
    }
  
+   // Note: at this point the thread object may already have deleted itself.
+   // Do not dereference it from here on out.
+ 
    log_info(os, thread)("Thread finished (tid: " UINTX_FORMAT ").", os::current_thread_id());
  
    // One less thread is executing
    // When the VMThread gets here, the main thread may have already exited
    // which frees the CodeHeap containing the Atomic::add code
    if (thread != VMThread::vm_thread() && VMThread::vm_thread() != NULL) {
      Atomic::dec(&os::win32::_os_thread_count);
    }
  
    // Thread must not return from exit_process_or_thread(), but if it does,
    // let it proceed to exit normally
    return (unsigned)os::win32::exit_process_or_thread(os::win32::EPT_THREAD, res);
  }