comparison src/share/vm/runtime/os.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 04b9a2566eec 94ec88ca68e2
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
79 julong os::num_mallocs = 0; // # of calls to malloc/realloc 79 julong os::num_mallocs = 0; // # of calls to malloc/realloc
80 julong os::alloc_bytes = 0; // # of bytes allocated 80 julong os::alloc_bytes = 0; // # of bytes allocated
81 julong os::num_frees = 0; // # of calls to free 81 julong os::num_frees = 0; // # of calls to free
82 julong os::free_bytes = 0; // # of bytes freed 82 julong os::free_bytes = 0; // # of bytes freed
83 #endif 83 #endif
84
85 void os_init_globals() {
86 // Called from init_globals().
87 // See Threads::create_vm() in thread.cpp, and init.cpp.
88 os::init_globals();
89 }
84 90
85 // Fill in buffer with current local time as an ISO-8601 string. 91 // Fill in buffer with current local time as an ISO-8601 string.
86 // E.g., yyyy-mm-ddThh:mm:ss-zzzz. 92 // E.g., yyyy-mm-ddThh:mm:ss-zzzz.
87 // Returns buffer, or NULL if it failed. 93 // Returns buffer, or NULL if it failed.
88 // This would mostly be a call to 94 // This would mostly be a call to
1093 "%/lib/rt.jar:" 1099 "%/lib/rt.jar:"
1094 "%/lib/sunrsasign.jar:" 1100 "%/lib/sunrsasign.jar:"
1095 "%/lib/jsse.jar:" 1101 "%/lib/jsse.jar:"
1096 "%/lib/jce.jar:" 1102 "%/lib/jce.jar:"
1097 "%/lib/charsets.jar:" 1103 "%/lib/charsets.jar:"
1104 "%/lib/jfr.jar:"
1098 #ifdef __APPLE__ 1105 #ifdef __APPLE__
1099 "%/lib/JObjC.jar:" 1106 "%/lib/JObjC.jar:"
1100 #endif 1107 #endif
1101 "%/classes"; 1108 "%/classes";
1102 char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); 1109 char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);