jdk8-mips64-public/hotspot: comparison src/os/posix/launcher/java

-:eda6988c0d81
+:f08d439fab8c
 #ifndef GAMMA
 #include "manifest_info.h"
 #include "version_comp.h"
 #endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
 #include <pthread.h>
 #else
 #include <thread.h>
 #endif
+#ifdef __APPLE__
+#define JVM_DLL "libjvm.dylib"
+#define JAVA_DLL "libjava.dylib"
+#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
+#else
 #define JVM_DLL "libjvm.so"
 #define JAVA_DLL "libjava.so"
+#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
+#endif
 #ifndef GAMMA   /* launcher.make defines ARCH */
 /*
 * If a processor / os combination has the ability to run binaries of
 * two data models and cohabitation of jre/jdk bits with both data
 #else
 /*
 * If not on Solaris, assume only a single LD_LIBRARY_PATH
 * variable.
 */
-runpath = getenv("LD_LIBRARY_PATH");
+runpath = getenv(LD_LIBRARY_PATH);
 #endif /* __sun */
-#ifdef __linux
+#if defined(__linux__)
 /*
 * On linux, if a binary is running as sgid or suid, glibc sets
 * LD_LIBRARY_PATH to the empty string for security purposes.  (In
 * contrast, on Solaris the LD_LIBRARY_PATH variable for a
 * privileged binary does not lose its settings; but the dynamic
 * be found must be handled through other mechanisms.
 */
 if((getgid() != getegid()) || (getuid() != geteuid()) ) {
 return;
 }
+#elif defined(_ALLBSD_SOURCE)
+/*
+* On BSD, if a binary is running as sgid or suid, libc sets
+* LD_LIBRARY_PATH to the empty string for security purposes.  (In
+* contrast, on Solaris the LD_LIBRARY_PATH variable for a
+* privileged binary does not lose its settings; but the dynamic
+* linker does apply more scrutiny to the path.) The launcher uses
+* the value of LD_LIBRARY_PATH to prevent an exec loop.
+* Therefore, if we are running sgid or suid, this function's
+* setting of LD_LIBRARY_PATH will be ineffective and we should
+* return from the function now.  Getting the right libraries to
+* be found must be handled through other mechanisms.
+*/
+if(issetugid()) {
+return;
+}
 #endif
 /* runpath contains current effective LD_LIBRARY_PATH setting */
 jvmpath = JLI_StringDup(jvmpath);
 new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
 2*strlen(jrepath) + 2*strlen(arch) +
 strlen(jvmpath) + 52);
-newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
+newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
 /*
 * Create desired LD_LIBRARY_PATH value for target data model.
 */
 *lastslash = '\0';
 /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
-sprintf(new_runpath, "LD_LIBRARY_PATH="
+sprintf(new_runpath, LD_LIBRARY_PATH "="
 "%s:"
 "%s/lib/%s:"
 "%s/../lib/%s",
 jvmpath,
 #ifdef DUAL_MODE
 * "/foo" into buf.
 */
 jboolean
 GetApplicationHome(char *buf, jint bufsize)
 {
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
 char *execname = GetExecname();
 if (execname) {
 strncpy(buf, execname, bufsize-1);
 buf[bufsize-1] = '\0';
 } else {
 #endif
 }
 #endif /* __sun && i586 */
-#if defined(__linux__) && defined(i586)
+#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(i586)
 /*
 * A utility method for asking the CPU about itself.
 * There's a corresponding version of solaris-i586
 * because the compilers are different.
 return result;
 }
 #endif /* __linux__ && i586 */
+#if defined(_ALLBSD_SOURCE) && defined(i586)
+/* The definition of a server-class machine for bsd-i586 */
+jboolean
+bsd_i586_ServerClassMachine(void) {
+jboolean            result            = JNI_FALSE;
+/* How big is a server class machine? */
+const unsigned long server_processors = 2UL;
+const uint64_t      server_memory     = 2UL * GB;
+/*
+* We seem not to get our full complement of memory.
+*     We allow some part (1/8?) of the memory to be "missing",
+*     based on the sizes of DIMMs, and maybe graphics cards.
+*/
+const uint64_t      missing_memory    = 256UL * MB;
+const uint64_t      actual_memory     = physical_memory();
+/* Is this a server class machine? */
+if (actual_memory >= (server_memory - missing_memory)) {
+const unsigned long actual_processors = physical_processors();
+if (actual_processors >= server_processors) {
+result = JNI_TRUE;
+}
+}
+if (_launcher_debug) {
+printf("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
+(result == JNI_TRUE ? "true" : "false"));
+}
+return result;
+}
+#endif /* _ALLBSD_SOURCE && i586 */
 /* Dispatch to the platform-specific definition of "server-class" */
 jboolean
 ServerClassMachine(void) {
 jboolean result = JNI_FALSE;
 #if   defined(NEVER_ACT_AS_SERVER_CLASS_MACHINE)
 result = solaris_sparc_ServerClassMachine();
 #elif defined(__sun) && defined(i586)
 result = solaris_i586_ServerClassMachine();
 #elif defined(__linux__) && defined(i586)
 result = linux_i586_ServerClassMachine();
+#elif defined(_ALLBSD_SOURCE) && defined(i586)
+result = bsd_i586_ServerClassMachine();
 #else
 if (_launcher_debug) {
 printf("ServerClassMachine: returns default value of %s\n",
 (result == JNI_TRUE ? "true" : "false"));
 }
 * Block current thread and continue execution in a new thread
 */
 int
 ContinueInNewThread(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
 int rslt;
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
 pthread_t tid;
 pthread_attr_t attr;
 pthread_attr_init(&attr);
 pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);

comparison: src/os/posix/launcher/java_md.c

src/os/posix/launcher/java_md.c

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/os/posix/launcher/java_md.c

src/os/posix/launcher/java_md.c