Mercurial > hg > graal-jvmci-8

comparison src/os/linux/vm/os_linux.cpp @ 20204:d22136881b85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author robm
date Thu, 17 Jul 2014 18:03:26 +0100
parents ce8f6bb717c9 f73af4455d7d
children 833b0f92429a
comparison
equal deleted inserted replaced
20203:4ca77b815015 20204:d22136881b85
1549 void os::die() { 1549 void os::die() {
1550 // _exit() on LinuxThreads only kills current thread 1550 // _exit() on LinuxThreads only kills current thread
1551 ::abort(); 1551 ::abort();
1552 } 1552 }
1553 1553
1554 // unused on linux for now.
1555 void os::set_error_file(const char *logfile) {}
1556
1557 1554
1558 // This method is a copy of JDK's sysGetLastErrorString 1555 // This method is a copy of JDK's sysGetLastErrorString
1559 // from src/solaris/hpi/src/system_md.c 1556 // from src/solaris/hpi/src/system_md.c
1560 1557
1561 size_t os::lasterror(char *buf, size_t len) { 1558 size_t os::lasterror(char *buf, size_t len) {
2340 return; 2337 return;
2341 2338
2342 // determine if this is a legacy image or modules image 2339 // determine if this is a legacy image or modules image
2343 // modules image doesn't have "jre" subdirectory 2340 // modules image doesn't have "jre" subdirectory
2344 len = strlen(buf); 2341 len = strlen(buf);
2342 assert(len < buflen, "Ran out of buffer room");
2345 jrelib_p = buf + len; 2343 jrelib_p = buf + len;
2346 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); 2344 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
2347 if (0 != access(buf, F_OK)) { 2345 if (0 != access(buf, F_OK)) {
2348 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch); 2346 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
2349 } 2347 }
2360 } 2358 }
2361 } 2359 }
2362 } 2360 }
2363 } 2361 }
2364 2362
2365 strcpy(saved_jvm_path, buf); 2363 strncpy(saved_jvm_path, buf, MAXPATHLEN);
2366 } 2364 }
2367 2365
2368 void os::print_jni_name_prefix_on(outputStream* st, int args_size) { 2366 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
2369 // no prefix required, not even "_" 2367 // no prefix required, not even "_"
2370 } 2368 }