comparison src/os/linux/vm/os_linux.cpp @ 18007:364b73402247

Merge
author asaha
date Thu, 22 May 2014 11:09:06 -0700
parents 6048424d3865 5656140324ed
children f73af4455d7d
comparison
equal deleted inserted replaced
17920:382a82b0a3e7 18007:364b73402247
1546 void os::die() { 1546 void os::die() {
1547 // _exit() on LinuxThreads only kills current thread 1547 // _exit() on LinuxThreads only kills current thread
1548 ::abort(); 1548 ::abort();
1549 } 1549 }
1550 1550
1551 // unused on linux for now.
1552 void os::set_error_file(const char *logfile) {}
1553
1554 1551
1555 // This method is a copy of JDK's sysGetLastErrorString 1552 // This method is a copy of JDK's sysGetLastErrorString
1556 // from src/solaris/hpi/src/system_md.c 1553 // from src/solaris/hpi/src/system_md.c
1557 1554
1558 size_t os::lasterror(char *buf, size_t len) { 1555 size_t os::lasterror(char *buf, size_t len) {
2337 return; 2334 return;
2338 2335
2339 // determine if this is a legacy image or modules image 2336 // determine if this is a legacy image or modules image
2340 // modules image doesn't have "jre" subdirectory 2337 // modules image doesn't have "jre" subdirectory
2341 len = strlen(buf); 2338 len = strlen(buf);
2339 assert(len < buflen, "Ran out of buffer room");
2342 jrelib_p = buf + len; 2340 jrelib_p = buf + len;
2343 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); 2341 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
2344 if (0 != access(buf, F_OK)) { 2342 if (0 != access(buf, F_OK)) {
2345 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch); 2343 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
2346 } 2344 }
2357 } 2355 }
2358 } 2356 }
2359 } 2357 }
2360 } 2358 }
2361 2359
2362 strcpy(saved_jvm_path, buf); 2360 strncpy(saved_jvm_path, buf, MAXPATHLEN);
2363 } 2361 }
2364 2362
2365 void os::print_jni_name_prefix_on(outputStream* st, int args_size) { 2363 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
2366 // no prefix required, not even "_" 2364 // no prefix required, not even "_"
2367 } 2365 }