graal-jvmci-8: src/os/linux/vm/os

comparison src/os/linux/vm/os_linux.cpp @ 17848:6048424d3865

8038201: Clean up misleading usage of malloc() in init_system_properties_values() Summary: Remove the misleading malloc macro and cleanup the code Reviewed-by: dsamersoff, kvn Contributed-by: goetz.lindenmaier@sap.com

author	goetz
date	Thu, 10 Apr 2014 04:07:45 -0700
parents	21dd1c827123
children	78bbf4d43a14 364b73402247

comparison

equal deleted inserted replaced

-:a57ba009d4dc
+:6048424d3865
 _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
 assert(processor_count() > 0, "linux error");
 }
 void os::init_system_properties_values() {
-//  char arch[12];
-//  sysinfo(SI_ARCHITECTURE, arch, sizeof(arch));
 // The next steps are taken in the product version:
 //
 // Obtain the JAVA_HOME value from the location of libjvm.so.
 // This library should be located at:
 // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
 // Otherwise exit.
 //
 // Important note: if the location of libjvm.so changes this
 // code needs to be changed accordingly.
-// The next few definitions allow the code to be verbatim:
+// See ld(1):
-#define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n), mtInternal)
+//      The linker uses the following search paths to locate required
-#define getenv(n) ::getenv(n)
+//      shared libraries:
+//        1: ...
-/*
+//        ...
-* See ld(1):
+//        7: The default directories, normally /lib and /usr/lib.
-*      The linker uses the following search paths to locate required
-*      shared libraries:
-*        1: ...
-*        ...
-*        7: The default directories, normally /lib and /usr/lib.
-*/
 #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
 #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
 #else
 #define DEFAULT_LIBPATH "/lib:/usr/lib"
 #endif
+// Base path of extensions installed on the system.
+#define SYS_EXT_DIR     "/usr/java/packages"
 #define EXTENSIONS_DIR  "/lib/ext"
 #define ENDORSED_DIR    "/lib/endorsed"
-#define REG_DIR         "/usr/java/packages"
+// Buffer that fits several sprintfs.
+// Note that the space for the colon and the trailing null are provided
+// by the nulls included by the sizeof operator.
+const size_t bufsize =
+MAX3((size_t)MAXPATHLEN,  // For dll_dir & friends.
+(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR), // extensions dir
+(size_t)MAXPATHLEN + sizeof(ENDORSED_DIR)); // endorsed dir
+char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+// sysclasspath, java_home, dll_dir
 {
-/* sysclasspath, java_home, dll_dir */
+char *pslash;
-{
+os::jvm_path(buf, bufsize);
-char *home_path;
-char *dll_path;
+// Found the full path to libjvm.so.
-char *pslash;
+// Now cut the path to <java_home>/jre if we can.
-char buf[MAXPATHLEN];
+*(strrchr(buf, '/')) = '\0'; // Get rid of /libjvm.so.
-os::jvm_path(buf, sizeof(buf));
+pslash = strrchr(buf, '/');
+if (pslash != NULL) {
-// Found the full path to libjvm.so.
+*pslash = '\0';            // Get rid of /{client|server|hotspot}.
-// Now cut the path to <java_home>/jre if we can.
+}
-*(strrchr(buf, '/')) = '\0';  /* get rid of /libjvm.so */
+Arguments::set_dll_dir(buf);
+if (pslash != NULL) {
+pslash = strrchr(buf, '/');
+if (pslash != NULL) {
+*pslash = '\0';          // Get rid of /<arch>.
 pslash = strrchr(buf, '/');
-if (pslash != NULL)
-*pslash = '\0';           /* get rid of /{client|server|hotspot} */
-dll_path = malloc(strlen(buf) + 1);
-if (dll_path == NULL)
-return;
-strcpy(dll_path, buf);
-Arguments::set_dll_dir(dll_path);
 if (pslash != NULL) {
-pslash = strrchr(buf, '/');
+*pslash = '\0';        // Get rid of /lib.
-if (pslash != NULL) {
-*pslash = '\0';       /* get rid of /<arch> */
-pslash = strrchr(buf, '/');
-if (pslash != NULL)
-*pslash = '\0';   /* get rid of /lib */
-}
 }
+}
-home_path = malloc(strlen(buf) + 1);
+}
-if (home_path == NULL)
+Arguments::set_java_home(buf);
-return;
+set_boot_path('/', ':');
-strcpy(home_path, buf);
+}
-Arguments::set_java_home(home_path);
+// Where to look for native libraries.
-if (!set_boot_path('/', ':'))
+//
-return;
+// Note: Due to a legacy implementation, most of the library path
-}
+// is set in the launcher. This was to accomodate linking restrictions
+// on legacy Linux implementations (which are no longer supported).
-/*
+// Eventually, all the library path setting will be done here.
-* Where to look for native libraries
+//
-*
+// However, to prevent the proliferation of improperly built native
-* Note: Due to a legacy implementation, most of the library path
+// libraries, the new path component /usr/java/packages is added here.
-* is set in the launcher.  This was to accomodate linking restrictions
+// Eventually, all the library path setting will be done here.
-* on legacy Linux implementations (which are no longer supported).
+{
-* Eventually, all the library path setting will be done here.
+// Get the user setting of LD_LIBRARY_PATH, and prepended it. It
-*
+// should always exist (until the legacy problem cited above is
-* However, to prevent the proliferation of improperly built native
+// addressed).
-* libraries, the new path component /usr/java/packages is added here.
+const char *v = ::getenv("LD_LIBRARY_PATH");
-* Eventually, all the library path setting will be done here.
+const char *v_colon = ":";
-*/
+if (v == NULL) { v = ""; v_colon = ""; }
-{
+// That's +1 for the colon and +1 for the trailing '\0'.
-char *ld_library_path;
+char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
+strlen(v) + 1 +
-/*
+sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
-* Construct the invariant part of ld_library_path. Note that the
+mtInternal);
-* space for the colon and the trailing null are provided by the
+sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);
-* nulls included by the sizeof operator (so actually we allocate
+Arguments::set_library_path(ld_library_path);
-* a byte more than necessary).
+FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);
-*/
+}
-ld_library_path = (char *) malloc(sizeof(REG_DIR) + sizeof("/lib/") +
-strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH));
+// Extensions directories.
-sprintf(ld_library_path, REG_DIR "/lib/%s:" DEFAULT_LIBPATH, cpu_arch);
+sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
+Arguments::set_ext_dirs(buf);
-/*
-* Get the user setting of LD_LIBRARY_PATH, and prepended it.  It
+// Endorsed standards default directory.
-* should always exist (until the legacy problem cited above is
+sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
-* addressed).
+Arguments::set_endorsed_dirs(buf);
-*/
-char *v = getenv("LD_LIBRARY_PATH");
+FREE_C_HEAP_ARRAY(char, buf, mtInternal);
-if (v != NULL) {
-char *t = ld_library_path;
+#undef DEFAULT_LIBPATH
-/* That's +1 for the colon and +1 for the trailing '\0' */
+#undef SYS_EXT_DIR
-ld_library_path = (char *) malloc(strlen(v) + 1 + strlen(t) + 1);
-sprintf(ld_library_path, "%s:%s", v, t);
-}
-Arguments::set_library_path(ld_library_path);
-}
-/*
-* Extensions directories.
-*
-* Note that the space for the colon and the trailing null are provided
-* by the nulls included by the sizeof operator (so actually one byte more
-* than necessary is allocated).
-*/
-{
-char *buf = malloc(strlen(Arguments::get_java_home()) +
-sizeof(EXTENSIONS_DIR) + sizeof(REG_DIR) + sizeof(EXTENSIONS_DIR));
-sprintf(buf, "%s" EXTENSIONS_DIR ":" REG_DIR EXTENSIONS_DIR,
-Arguments::get_java_home());
-Arguments::set_ext_dirs(buf);
-}
-/* Endorsed standards default directory. */
-{
-char * buf;
-buf = malloc(strlen(Arguments::get_java_home()) + sizeof(ENDORSED_DIR));
-sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
-Arguments::set_endorsed_dirs(buf);
-}
-}
-#undef malloc
-#undef getenv
 #undef EXTENSIONS_DIR
 #undef ENDORSED_DIR
-// Done
-return;
 }
 ////////////////////////////////////////////////////////////////////////////////
 // breakpoint support

Mercurial > hg > graal-jvmci-8

comparison src/os/linux/vm/os_linux.cpp @ 17848:6048424d3865