Changeset 274

Timestamp:

Mar 9, 2011, 9:38:55 PM (14 years ago)

Author:

dmik

Message:

jdk: Provide common DllMain() code that calls static destructors when the DLL is detached from the process at termination and use it in JAWTOS2.DLL and JSOUND*.DLL. This fixes crashes in WGSS50.DLL and KERNEL32.DLL during Java process termination when running some applications (e.g. any application using sound, see #78 for details).

Location:

trunk/openjdk/jdk

Files:

• make/common/Library.gmk (modified) (1 diff)
• make/javax/sound/FILES_c.gmk (modified) (2 diffs)
• make/javax/sound/jsoundds/Makefile (modified) (1 diff)
• make/sun/awt/Makefile (modified) (1 diff)
• src/os2/native/common (added)
• src/os2/native/common/jdk_DllMain.cpp (moved) (moved from trunk/openjdk/jdk/src/os2/native/sun/os2/awt_init.cpp ) (6 diffs)

trunk/openjdk/jdk/make/common/Library.gmk

@@ -340 +340 @@
 OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/common
 OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/$(PKGDIR)
+# path to common code used by many DLLs
+vpath %.cpp $(PLATFORM_SRC_OS2)/native/common
 endif
 

trunk/openjdk/jdk/make/javax/sound/FILES_c.gmk

@@ -33 +33 @@
         PLATFORM_API_SolarisOS_PCM.c
 
-FILES_linux = 
+FILES_linux =
 
 FILES_windows = \
@@ -46 +46 @@
         PLATFORM_API_WinOS_Util.c \
         PLATFORM_API_WinOS_Ports.c
-        
+
+ifeq ($(PLATFORM), os2)
+FILES_cpp += \
+        jdk_DllMain.cpp
+endif
+
 FILES_export = \
         com/sun/media/sound/Platform.java

trunk/openjdk/jdk/make/javax/sound/jsoundds/Makefile

@@ -47 +47 @@
         PLATFORM_API_WinOS_DirectSound.cpp
 
+ifeq ($(PLATFORM), os2)
+FILES_cpp += \
+        jdk_DllMain.cpp
+endif
+
 FILES_export = \
         $(DAUDIOFILES_export)

trunk/openjdk/jdk/make/sun/awt/Makefile

@@ -94 +94 @@
 include FILES_export_windows.gmk
 
-FILES_c += awt_init.c
+FILES_cpp += jdk_DllMain.cpp
 
 #

trunk/openjdk/jdk/src/os2/native/common/jdk_DllMain.cpp

@@ -3 +3 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2010 netlabs.org. OS/2 Parts.
+ * Copyright 2010-2011 netlabs.org. OS/2 Parts.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26 +26 @@
  */
 
-// This code performs C++ runtime initialization and registers the DLL
-// with Odin
+// This code performs C++ runtime termination to make sure that the
+// destructors of static objects are destroyed before Odin unloads itself
+// at program termination. This is achieved by registering the DLL with Odin
+// which makes sure it calls the supplied DllMain() routine at the right
+// time. Note that using DosExitList() for this purpose is not a good idea
+// because some Odin services still needed by the destructor code of some JDK
+// classes may already be down when exit list routines are run.
 
 #define INCL_DOSPROCESS
@@ -33 +38 @@
 #include <odinlx.h>
 #include <misc.h>
-#include <exitlist.h>
-
-//#include <types.h>
-//#include <stdio.h>
 
 #include <emx/startup.h>
 
-static void APIENTRY cleanup(ULONG reason);
+static HMODULE dllHandle = 0;
 
-static HMODULE dllHandle = 0;
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
+{
+    // call destructors when detaching the DLL from the process
+    if (reason == 0)
+        __ctordtorTerm();
+
+    return TRUE;
+}
 
 unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long ulFlag)
 {
-    APIRET rc;
-
     // If ulFlag is zero then the DLL is being loaded so initialization should
     // be performed.  If ulFlag is 1 then the DLL is being freed so termination
@@ -53 +59 @@
 
     // Note that we don't perform CRT initialization and things because this
-    // is done in os_os2_init.cpp of JVM.DLL that is already loaded
+    // is done in os_os2_init.cpp of JVM.DLL that is always loaded first
 
     switch (ulFlag) {
         case 0 :
-            dllHandle = RegisterLxDll(hModule, NULL, NULL,
+            dllHandle = RegisterLxDll(hModule, DllMain, NULL,
                                       ODINNT_MAJOR_VERSION,
                                       ODINNT_MINOR_VERSION,
@@ -66 +72 @@
             __ctordtorInit();
 
-            rc = DosExitList(EXITLIST_APPDLL|EXLST_ADD, cleanup);
-            if (rc)
-                break;
-
             return 1;
 
         case 1 :
-            if (dllHandle) {
+            if (dllHandle)
                 UnregisterLxDll(dllHandle);
-            }
             return 1;
 
@@ -85 +86 @@
     return 0;
 }
-
-static void APIENTRY cleanup(ULONG /*ulReason*/)
-{
-   __ctordtorTerm();
-   DosExitList(EXLST_EXIT, cleanup);
-   return ;
-}
-