comparison src/os/bsd/vm/os_bsd.cpp @ 20204:d22136881b85

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
1167 void os::die() { 1167 void os::die() {
1168 // _exit() on BsdThreads only kills current thread 1168 // _exit() on BsdThreads only kills current thread
1169 ::abort(); 1169 ::abort();
1170 } 1170 }
1171 1171
1172 // unused on bsd for now.
1173 void os::set_error_file(const char *logfile) {}
1174
1175
1176 // This method is a copy of JDK's sysGetLastErrorString 1172 // This method is a copy of JDK's sysGetLastErrorString
1177 // from src/solaris/hpi/src/system_md.c 1173 // from src/solaris/hpi/src/system_md.c
1178 1174
1179 size_t os::lasterror(char *buf, size_t len) { 1175 size_t os::lasterror(char *buf, size_t len) {
1180 1176
1825 return; 1821 return;
1826 1822
1827 // determine if this is a legacy image or modules image 1823 // determine if this is a legacy image or modules image
1828 // modules image doesn't have "jre" subdirectory 1824 // modules image doesn't have "jre" subdirectory
1829 len = strlen(buf); 1825 len = strlen(buf);
1826 assert(len < buflen, "Ran out of buffer space");
1830 jrelib_p = buf + len; 1827 jrelib_p = buf + len;
1831 1828
1832 // Add the appropriate library subdir 1829 // Add the appropriate library subdir
1833 snprintf(jrelib_p, buflen-len, "/jre/lib"); 1830 snprintf(jrelib_p, buflen-len, "/jre/lib");
1834 if (0 != access(buf, F_OK)) { 1831 if (0 != access(buf, F_OK)) {
1858 } 1855 }
1859 } 1856 }
1860 } 1857 }
1861 } 1858 }
1862 1859
1863 strcpy(saved_jvm_path, buf); 1860 strncpy(saved_jvm_path, buf, MAXPATHLEN);
1864 } 1861 }
1865 1862
1866 void os::print_jni_name_prefix_on(outputStream* st, int args_size) { 1863 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
1867 // no prefix required, not even "_" 1864 // no prefix required, not even "_"
1868 } 1865 }