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

equal deleted inserted replaced

-:86dbf3cacacc
+:4d9030fe341f
 // Copied from libhpi
 const size_t pnamelen = pname ? strlen(pname) : 0;
 // Quietly truncate on buffer overflow.  Should be an error.
 if (pnamelen + strlen(fname) + 10 > (size_t) buflen) {
 *buffer = '\0';
 return;
 }
 if (pnamelen == 0) {
 snprintf(buffer, buflen, "lib%s.so", fname);
 } else if (strchr(pname, *os::path_separator()) != NULL) {
 {EM_X86_64,      EM_X86_64,  ELFCLASS64, ELFDATA2LSB, (char*)"AMD 64"},
 {EM_SPARC,       EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
 {EM_SPARC32PLUS, EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
 {EM_SPARCV9,     EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
 {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
-{EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
+{EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+{EM_ARM,         EM_ARM,     ELFCLASS32, ELFDATA2LSB, (char*)"ARM 32"}
 };
 #if  (defined IA32)
 static  Elf32_Half running_arch_code=EM_386;
 #elif   (defined AMD64)
 static  Elf32_Half running_arch_code=EM_SPARC;
 #elif  (defined __powerpc64__)
 static  Elf32_Half running_arch_code=EM_PPC64;
 #elif  (defined __powerpc__)
 static  Elf32_Half running_arch_code=EM_PPC;
+#elif (defined ARM)
+static  Elf32_Half running_arch_code=EM_ARM;
 #else
 #error Method os::dll_load requires that one of following is defined:\
-IA32, AMD64, IA64, __sparc, __powerpc__
+IA32, AMD64, IA64, __sparc, __powerpc__, ARM, ARM
 #endif
 // Identify compatability class for VM's architecture and library's architecture
 // Obtain string descriptions for architectures
 // Don't bother to probe page size because getpagesizes() comes with MPSS.
 // ISM is only recommended on old Solaris where there is no MPSS support.
 // Simply choose a conservative value as default.
 *page_size = LargePageSizeInBytes ? LargePageSizeInBytes :
-SPARC_ONLY(4 * M) IA32_ONLY(4 * M) AMD64_ONLY(2 * M);
+SPARC_ONLY(4 * M) IA32_ONLY(4 * M) AMD64_ONLY(2 * M)
+ARM_ONLY(2 * M);
 // ISM is available on all supported Solaris versions
 return true;
 }
 init_pset_getloadavg_ptr();
 return JNI_OK;
 }
+void os::init_3(void) {
+return;
+}
 // Mark the polling page as unreadable
 void os::make_polling_page_unreadable(void) {
 if( mprotect((char *)_polling_page, page_size, PROT_NONE) != 0 )
 fatal("Could not disable polling page");
 return ::getloadavg(loadavg, nelem);
 }
 }
 //---------------------------------------------------------------------------------
-#ifndef PRODUCT
 static address same_page(address x, address y) {
 intptr_t page_bits = -os::vm_page_size();
 if ((intptr_t(x) & page_bits) == (intptr_t(y) & page_bits))
 return x;
 return (address)(intptr_t(y) | ~page_bits) + 1;
 else
 return (address)(intptr_t(y) & page_bits);
 }
-bool os::find(address addr) {
+bool os::find(address addr, outputStream* st) {
 Dl_info dlinfo;
 memset(&dlinfo, 0, sizeof(dlinfo));
 if (dladdr(addr, &dlinfo)) {
 #ifdef _LP64
-tty->print("0x%016lx: ", addr);
+st->print("0x%016lx: ", addr);
 #else
-tty->print("0x%08x: ", addr);
+st->print("0x%08x: ", addr);
 #endif
 if (dlinfo.dli_sname != NULL)
-tty->print("%s+%#lx", dlinfo.dli_sname, addr-(intptr_t)dlinfo.dli_saddr);
+st->print("%s+%#lx", dlinfo.dli_sname, addr-(intptr_t)dlinfo.dli_saddr);
 else if (dlinfo.dli_fname)
-tty->print("<offset %#lx>", addr-(intptr_t)dlinfo.dli_fbase);
+st->print("<offset %#lx>", addr-(intptr_t)dlinfo.dli_fbase);
 else
-tty->print("<absolute address>");
+st->print("<absolute address>");
-if (dlinfo.dli_fname)  tty->print(" in %s", dlinfo.dli_fname);
+if (dlinfo.dli_fname)  st->print(" in %s", dlinfo.dli_fname);
 #ifdef _LP64
-if (dlinfo.dli_fbase)  tty->print(" at 0x%016lx", dlinfo.dli_fbase);
+if (dlinfo.dli_fbase)  st->print(" at 0x%016lx", dlinfo.dli_fbase);
 #else
-if (dlinfo.dli_fbase)  tty->print(" at 0x%08x", dlinfo.dli_fbase);
+if (dlinfo.dli_fbase)  st->print(" at 0x%08x", dlinfo.dli_fbase);
 #endif
-tty->cr();
+st->cr();
 if (Verbose) {
 // decode some bytes around the PC
 address begin = same_page(addr-40, addr);
 address end   = same_page(addr+40, addr);
 if (begin < lowest)  begin = lowest;
 Dl_info dlinfo2;
 if (dladdr(end, &dlinfo2) && dlinfo2.dli_saddr != dlinfo.dli_saddr
 && end > dlinfo2.dli_saddr && dlinfo2.dli_saddr > begin)
 end = (address) dlinfo2.dli_saddr;
-Disassembler::decode(begin, end);
+Disassembler::decode(begin, end, st);
 }
 return true;
 }
 return false;
 }
-#endif
 // Following function has been added to support HotSparc's libjvm.so running
 // under Solaris production JDK 1.2.2 / 1.3.0.  These came from
 // src/solaris/hpi/native_threads in the EVM codebase.
 //
 // If externally suspended while waiting, re-suspend
 if (jt->handle_special_suspend_equivalent_condition()) {
 jt->java_suspend_self();
 }
 OrderAccess::fence();
 }
 void Parker::unpark() {
 int s, status ;
 // Unknown exit code; pass it through
 return status;
 }
 }
 }
+// is_headless_jre()
+//
+// Test for the existence of libmawt in motif21 or xawt directories
+// in order to report if we are running in a headless jre
+//
+bool os::is_headless_jre() {
+struct stat statbuf;
+char buf[MAXPATHLEN];
+char libmawtpath[MAXPATHLEN];
+const char *xawtstr  = "/xawt/libmawt.so";
+const char *motifstr = "/motif21/libmawt.so";
+char *p;
+// Get path to libjvm.so
+os::jvm_path(buf, sizeof(buf));
+// Get rid of libjvm.so
+p = strrchr(buf, '/');
+if (p == NULL) return false;
+else *p = '\0';
+// Get rid of client or server
+p = strrchr(buf, '/');
+if (p == NULL) return false;
+else *p = '\0';
+// check xawt/libmawt.so
+strcpy(libmawtpath, buf);
+strcat(libmawtpath, xawtstr);
+if (::stat(libmawtpath, &statbuf) == 0) return false;
+// check motif21/libmawt.so
+strcpy(libmawtpath, buf);
+strcat(libmawtpath, motifstr);
+if (::stat(libmawtpath, &statbuf) == 0) return false;
+return true;
+}

changeset 6176	4d9030fe341f
parent 5922	883ecb03d008
child 6962	d49132ce025b