jdk-sandbox: comparison hotspot/src/os/windows/vm/os

equal deleted inserted replaced

-:3107be2ba9c6
+:0e2e188ab887
 if (home_path == NULL) {
 return;
 }
 strcpy(home_path, home_dir);
 Arguments::set_java_home(home_path);
-FREE_C_HEAP_ARRAY(char, home_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, home_path);
 dll_path = NEW_C_HEAP_ARRAY(char, strlen(home_dir) + strlen(bin) + 1,
 mtInternal);
 if (dll_path == NULL) {
 return;
 }
 strcpy(dll_path, home_dir);
 strcat(dll_path, bin);
 Arguments::set_dll_dir(dll_path);
-FREE_C_HEAP_ARRAY(char, dll_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, dll_path);
 if (!set_boot_path('\\', ';')) {
 return;
 }
 }
 }
 strcat(library_path, ";.");
 Arguments::set_library_path(library_path);
-FREE_C_HEAP_ARRAY(char, library_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, library_path);
 }
 // Default extensions directory
 {
 char path[MAX_PATH];
 dirname = alt_dirname;
 }
 dirp->path = (char *)malloc(strlen(dirname) + 5, mtInternal);
 if (dirp->path == 0) {
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOMEM;
 return 0;
 }
 strcpy(dirp->path, dirname);
 fattr = GetFileAttributes(dirp->path);
 if (fattr == 0xffffffff) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOENT;
 return 0;
 } else if ((fattr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOTDIR;
 return 0;
 }
 // Append "*.*", or possibly "\\*.*", to path
 }
 dirp->handle = FindFirstFile(dirp->path, &dirp->find_data);
 if (dirp->handle == INVALID_HANDLE_VALUE) {
 if (GetLastError() != ERROR_FILE_NOT_FOUND) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = EACCES;
 return 0;
 }
 }
 return dirp;
 errno = EBADF;
 return -1;
 }
 dirp->handle = INVALID_HANDLE_VALUE;
 }
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 return 0;
 }
 // This must be hard coded because it's the system's temporary
 // directory not the java application's temp directory, ala java.io.tmpdir.
 }
 }
 // release the storage
 for (int i = 0; i < n; i++) {
 if (pelements[i] != NULL) {
-FREE_C_HEAP_ARRAY(char, pelements[i], mtInternal);
+FREE_C_HEAP_ARRAY(char, pelements[i]);
 }
 }
 if (pelements != NULL) {
-FREE_C_HEAP_ARRAY(char*, pelements, mtInternal);
+FREE_C_HEAP_ARRAY(char*, pelements);
 }
 } else {
 jio_snprintf(buffer, buflen, "%s\\%s.dll", pname, fname);
 retval = true;
 }
 int *_numa_used_node_list;  // allocated below
 int _numa_used_node_count;
 void free_node_list() {
 if (_numa_used_node_list != NULL) {
-FREE_C_HEAP_ARRAY(int, _numa_used_node_list, mtInternal);
+FREE_C_HEAP_ARRAY(int, _numa_used_node_list);
 }
 }
 public:
 NUMANodeListHolder() {
 jio_snprintf(ebuf, ebuflen,
 "os::win32::load_windows_dll() cannot load %s from system directories.", name);
 return NULL;
 }
-#define MAX_EXIT_HANDLES    16
+#define MAX_EXIT_HANDLES PRODUCT_ONLY(32)   NOT_PRODUCT(128)
-#define EXIT_TIMEOUT      1000 /* 1 sec */
+#define EXIT_TIMEOUT     PRODUCT_ONLY(1000) NOT_PRODUCT(4000) /* 1 sec in product, 4 sec in debug */
 static BOOL CALLBACK init_crit_sect_call(PINIT_ONCE, PVOID pcrit_sect, PVOID*) {
 InitializeCriticalSection((CRITICAL_SECTION*)pcrit_sect);
 return TRUE;
 }
 }
 // If there's no free slot in the array of the kept handles, we'll have to
 // wait until at least one thread completes exiting.
 if ((handle_count = j) == MAX_EXIT_HANDLES) {
+// Raise the priority of the oldest exiting thread to increase its chances
+// to complete sooner.
+SetThreadPriority(handles[0], THREAD_PRIORITY_ABOVE_NORMAL);
 res = WaitForMultipleObjects(MAX_EXIT_HANDLES, handles, FALSE, EXIT_TIMEOUT);
 if (res >= WAIT_OBJECT_0 && res < (WAIT_OBJECT_0 + MAX_EXIT_HANDLES)) {
 i = (res - WAIT_OBJECT_0);
 handle_count = MAX_EXIT_HANDLES - 1;
 for (; i < handle_count; ++i) {
 handles[i] = handles[i + 1];
 }
 } else {
-warning("WaitForMultipleObjects failed in %s: %d\n", __FILE__, __LINE__);
+warning("WaitForMultipleObjects %s in %s: %d\n",
+(res == WAIT_FAILED ? "failed" : "timed out"), __FILE__, __LINE__);
 // Don't keep handles, if we failed waiting for them.
 for (i = 0; i < MAX_EXIT_HANDLES; ++i) {
 CloseHandle(handles[i]);
 }
 handle_count = 0;
 } else { // what != EPT_THREAD
 if (handle_count > 0) {
 // Before ending the process, make sure all the threads that had called
 // _endthreadex() completed.
+// Set the priority level of the current thread to the same value as
+// the priority level of exiting threads.
+// This is to ensure it will be given a fair chance to execute if
+// the timeout expires.
+hthr = GetCurrentThread();
+SetThreadPriority(hthr, THREAD_PRIORITY_ABOVE_NORMAL);
+for (i = 0; i < handle_count; ++i) {
+SetThreadPriority(handles[i], THREAD_PRIORITY_ABOVE_NORMAL);
+}
 res = WaitForMultipleObjects(handle_count, handles, TRUE, EXIT_TIMEOUT);
-if (res == WAIT_FAILED) {
+if (res < WAIT_OBJECT_0 || res >= (WAIT_OBJECT_0 + MAX_EXIT_HANDLES)) {
-warning("WaitForMultipleObjects failed in %s: %d\n", __FILE__, __LINE__);
+warning("WaitForMultipleObjects %s in %s: %d\n",
+(res == WAIT_FAILED ? "failed" : "timed out"), __FILE__, __LINE__);
 }
 for (i = 0; i < handle_count; ++i) {
 CloseHandle(handles[i]);
 }
 handle_count = 0;
 return FALSE;
 }
 error = ::PeekConsoleInput(han, lpBuffer, numEvents, &numEventsRead);
 if (error == 0) {
-os::free(lpBuffer, mtInternal);
+os::free(lpBuffer);
 return FALSE;
 }
 // Examine input records for the number of bytes available
 for (i=0; i<numEvents; i++) {
 }
 }
 }
 if (lpBuffer != NULL) {
-os::free(lpBuffer, mtInternal);
+os::free(lpBuffer);
 }
 *pbytes = (long) actualLength;
 return TRUE;
 }

changeset 27926	0e2e188ab887
parent 27562	47f369e3c69c
parent 27880	afb974a04396
child 28023	a4075664328d