comparison src/os/windows/vm/os_windows.cpp @ 20367:aef17e6b4abf

8055236: Deadlock during NMT2 shutdown on Windows Summary: Removed MemTracker::shutdown() call to avoid deadlock Reviewed-by: minqi, ctornqvi
author zgu
date Wed, 27 Aug 2014 08:42:58 -0400
parents 833b0f92429a
children 09259e52a610
comparison
equal deleted inserted replaced
20366:dd3939fe8424 20367:aef17e6b4abf
129 timeBeginPeriod(1L); 129 timeBeginPeriod(1L);
130 break; 130 break;
131 case DLL_PROCESS_DETACH: 131 case DLL_PROCESS_DETACH:
132 if(ForceTimeHighResolution) 132 if(ForceTimeHighResolution)
133 timeEndPeriod(1L); 133 timeEndPeriod(1L);
134
135 // Workaround for issue when a custom launcher doesn't call
136 // DestroyJavaVM and NMT is trying to track memory when free is
137 // called from a static destructor
138 MemTracker::shutdown();
139 134
140 break; 135 break;
141 default: 136 default:
142 break; 137 break;
143 } 138 }