Changeset 341 for trunk

Timestamp:

Mar 8, 2012, 2:46:46 PM (13 years ago)

Author:

dmik

Message:

jdk: Create JVM on main thread in Java executables on OS/2.

This fixes hangs at crashes when the Java process is killed
externally by Ctrl-C or by a kill signal (#33 and #159).

Location:

trunk/openjdk

Files:

• hotspot/src/share/tools/launcher/java.c (modified) (2 diffs)
• jdk/src/share/bin/java.c (modified) (2 diffs)

trunk/openjdk/hotspot/src/share/tools/launcher/java.c

@@ -79 +79 @@
 #include <string.h>
 
+#ifdef __OS2__
+#include <float.h> // for _control87
+#endif
+
 #include <jni.h>
 #include <jvm.h>
@@ -387 +391 @@
       args.ifn = ifn;
 
+#ifdef __OS2__
+      // On OS/2, both Ctrl-C and process termination handlers (including DLL
+      // uninitialization code) are always called on thread 1. If we fire off
+      // a new thread here and create the JVM on it (as other platfroms do),
+      // thread 1 will be not known to the JVM and this can cause various
+      // nexpected side-effects like hangs and crashes at Java process
+      // termination (see #33 and #159 for details). For this reason, we instead
+      // create the JVM right on thread 1.
+
+      // disable FPU exceptions (taken from jdk/src/windows/hpi/src/system_md.c)
+      _control87(MCW_EM | RC_NEAR | PC_53, MCW_EM | MCW_RC | MCW_PC);
+
+      return JavaMain(&args);
+#else
       return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args);
+#endif
     }
 }

trunk/openjdk/jdk/src/share/bin/java.c

@@ -58 +58 @@
 #include <string.h>
 
+#ifdef __OS2__
+#include <float.h> // for _control87
+#endif
+
 #include <jni.h>
 #include <jvm.h>
@@ -368 +372 @@
       args.ifn = ifn;
 
+#ifdef __OS2__
+      // On OS/2, both Ctrl-C and process termination handlers (including DLL
+      // uninitialization code) are always called on thread 1. If we fire off
+      // a new thread here and create the JVM on it (as other platfroms do),
+      // thread 1 will be not known to the JVM and this can cause various
+      // nexpected side-effects like hangs and crashes at Java process
+      // termination (see #33 and #159 for details). For this reason, we instead
+      // create the JVM right on thread 1.
+
+      // disable FPU exceptions (taken from jdk/src/windows/hpi/src/system_md.c)
+      _control87(MCW_EM | RC_NEAR | PC_53, MCW_EM | MCW_RC | MCW_PC);
+
+      return JavaMain(&args);
+#else
       return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
+#endif
     }
 }