From 213858c013438c43989052d3f86fb93b2e9b274a Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sun, 26 Nov 2000 01:48:04 +0000 Subject: System.java (setProperties): Only call init_properties() if properties is null. 2000-11-24 Bryce McKinlay * java/lang/System.java (setProperties): Only call init_properties() if properties is null. (getProperties): Ditto. (getProperty): Ditto. (setProperty): Call init_properties if properties are null. (prop_init): Remove field. * java/lang/natSystem.cc (init_properties): Synchronize the entire method. Check for null properties after synchronizing instead of prop_init flag. Set the properties field last for thread safety. * java/io/ObjectInputStream.java (ObjectInputStream): If DEBUG is set, test for gcj.dumpobjects property and enable object stream dumping if it is set. (dumpElement): No longer native. (dumpElementln): Ditto. (setDump): Do not define. * java/io/natObjectInputStream.cc (dumpElement): Removed. (dumpElementln): Removed. (setDump): Removed. 2000-11-24 Bryce McKinlay * configure: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (built_java_source_files): Add Configuration.java. * configure.in: Add Configuration.java to CONFIG_FILES. Set LIBGCJDEBUG substitution if --enable-libgcj-debug is specified. Create `gnu' directory in the build tree. * gnu/classpath/Configuration.java.in: New file. From-SVN: r37749 --- libjava/java/lang/System.java | 21 ++++++++++++--------- libjava/java/lang/natSystem.cc | 32 +++++++++++++++++--------------- 2 files changed, 29 insertions(+), 24 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/System.java b/libjava/java/lang/System.java index 52dbe75..59787099 100644 --- a/libjava/java/lang/System.java +++ b/libjava/java/lang/System.java @@ -63,7 +63,8 @@ public final class System { if (secman != null) secman.checkPropertiesAccess(); - init_properties (); + if (properties == null) + init_properties (); return properties; } @@ -71,7 +72,8 @@ public final class System { if (secman != null) secman.checkPropertyAccess(property); - init_properties (); + if (properties == null) + init_properties (); return properties.getProperty(property); } @@ -79,7 +81,8 @@ public final class System { if (secman != null) secman.checkPropertyAccess(property, defval); - init_properties (); + if (properties == null) + init_properties (); return properties.getProperty(property, defval); } @@ -128,15 +131,18 @@ public final class System { if (secman != null) secman.checkPropertiesAccess(); - // We might not have initialized yet. - prop_init = true; - properties = props; + synchronized (System.class) + { + properties = props; + } } public static String setProperty (String key, String value) { if (secman != null) secman.checkPermission (new PropertyPermission (key, "write")); + if (properties == null) + init_properties (); return (String) properties.setProperty (key, value); } @@ -165,7 +171,4 @@ public final class System // Private data. private static SecurityManager secman = null; private static Properties properties = null; - // This boolean is only required for 1.1 and earlier. After 1.1, a - // null properties should always be re-initialized. - private static boolean prop_init = false; } diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 35198fb..57133fb 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -217,18 +217,16 @@ getpwuid_adaptor(T_passwd * (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r, void java::lang::System::init_properties (void) { - { - // We only need to synchronize around this gatekeeper. - JvSynchronize sync (&java::lang::System::class$); - if (prop_init) - return; - prop_init = true; - } - - properties = new java::util::Properties (); + JvSynchronize sync (&java::lang::System::class$); + + if (properties != NULL) + return; + + java::util::Properties* newprops = new java::util::Properties (); + // A convenience define. #define SET(Prop,Val) \ - properties->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val)) + newprops->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val)) // A mixture of the Java Product Versioning Specification // (introduced in 1.2), and earlier versioning properties. @@ -351,7 +349,7 @@ java::lang::System::init_properties (void) ; jstring name = JvNewStringLatin1 (p, s - p); jstring val = JvNewStringLatin1 (*s == '=' ? s + 1 : s); - properties->put (name, val); + newprops->put (name, val); } // Set the system properties from the user's environment. @@ -368,13 +366,13 @@ java::lang::System::init_properties (void) } if (_Jv_Jar_Class_Path) - properties->put(JvNewStringLatin1 ("java.class.path"), - JvNewStringLatin1 (_Jv_Jar_Class_Path)); + newprops->put(JvNewStringLatin1 ("java.class.path"), + JvNewStringLatin1 (_Jv_Jar_Class_Path)); else { // FIXME: find libgcj.zip and append its path? char *classpath = ::getenv("CLASSPATH"); - jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path")); + jstring cp = newprops->getProperty (JvNewStringLatin1("java.class.path")); java::lang::StringBuffer *sb = new java::lang::StringBuffer (); if (classpath) @@ -391,7 +389,11 @@ java::lang::System::init_properties (void) else sb->append ((jchar) '.'); - properties->put(JvNewStringLatin1 ("java.class.path"), + newprops->put(JvNewStringLatin1 ("java.class.path"), sb->toString ()); } + // Finally, set the field. This ensures that concurrent getProperty() + // calls will return initialized values without requiring them to be + // synchronized in the common case. + properties = newprops; } -- cgit v1.1