Changeset 37990 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 29, 2008, 8:38:55 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-29 Steve Falkenburg <​[email protected]>

<rdar://problem/6326563> Crash on launch

For Windows, export explicit functions rather than exporting data for atomicallyInitializedStaticMutex.

Exporting data from a DLL on Windows requires specifying declspec(dllimport) in the header used by
callers, but declspec(dllexport) when defined in the DLL implementation. By instead exporting
the explicit lock/unlock functions, we can avoid this.

Fixes a crash on launch, since we were previously erroneously exporting atomicallyInitializedStaticMutex as a function.

Reviewed by Darin Adler.

• wtf/Threading.h: (WTF::lockAtomicallyInitializedStaticMutex): (WTF::unlockAtomicallyInitializedStaticMutex):
• wtf/ThreadingWin.cpp: (WTF::lockAtomicallyInitializedStaticMutex): (WTF::unlockAtomicallyInitializedStaticMutex):

WebKit/win:

2008-10-29 Steve Falkenburg <​[email protected]>

<rdar://problem/6326563> Crash on launch

For Windows, export explicit functions rather than exporting data for atomicallyInitializedStaticMutex.

Exporting data from a DLL on Windows requires specifying declspec(dllimport) in the header used by
callers, but declspec(dllexport) when defined in the DLL implementation. By instead exporting
the explicit lock/unlock functions, we can avoid this.

Fixes a crash on launch, since we were previously erroneously exporting atomicallyInitializedStaticMutex as a function.

Reviewed by Darin Adler.

• WebKit.vcproj/WebKit.def:
• WebKit.vcproj/WebKit_debug.def:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Threading.h (modified) (2 diffs)
• wtf/ThreadingWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-29  Steve Falkenburg  <[email protected]>
+
+        <rdar://problem/6326563> Crash on launch
+
+        For Windows, export explicit functions rather than exporting data for atomicallyInitializedStaticMutex.
+        
+        Exporting data from a DLL on Windows requires specifying __declspec(dllimport) in the header used by
+        callers, but __declspec(dllexport) when defined in the DLL implementation. By instead exporting
+        the explicit lock/unlock functions, we can avoid this.
+        
+        Fixes a crash on launch, since we were previously erroneously exporting atomicallyInitializedStaticMutex as a function.
+        
+        Reviewed by Darin Adler.
+
+        * wtf/Threading.h:
+        (WTF::lockAtomicallyInitializedStaticMutex):
+        (WTF::unlockAtomicallyInitializedStaticMutex):
+        * wtf/ThreadingWin.cpp:
+        (WTF::lockAtomicallyInitializedStaticMutex):
+        (WTF::unlockAtomicallyInitializedStaticMutex):
+
 2008-10-29  Sam Weinig  <[email protected]>
 

trunk/JavaScriptCore/wtf/Threading.h

@@ -96 +96 @@
 // For portability, we do not use thread-safe statics natively supported by some compilers (e.g. gcc).
 #define AtomicallyInitializedStatic(T, name) \
-    WTF::atomicallyInitializedStaticMutex->lock(); \
+    WTF::lockAtomicallyInitializedStaticMutex(); \
     static T name; \
-    WTF::atomicallyInitializedStaticMutex->unlock();
+    WTF::unlockAtomicallyInitializedStaticMutex();
 
 namespace WTF {
@@ -252 +252 @@
 void initializeThreading();
 
+#if !PLATFORM(WIN_OS)
 extern Mutex* atomicallyInitializedStaticMutex;
+inline void lockAtomicallyInitializedStaticMutex() { atomicallyInitializedStaticMutex->lock(); }
+inline void unlockAtomicallyInitializedStaticMutex() { atomicallyInitializedStaticMutex->unlock(); }
+#else
+void lockAtomicallyInitializedStaticMutex();
+void unlockAtomicallyInitializedStaticMutex();
+#endif
 
 } // namespace WTF

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -108 +108 @@
 }
 
-Mutex* atomicallyInitializedStaticMutex;
+static Mutex* atomicallyInitializedStaticMutex;
+
+void lockAtomicallyInitializedStaticMutex()
+{
+    atomicallyInitializedStaticMutex->lock();
+}
+
+void unlockAtomicallyInitializedStaticMutex()
+{
+    atomicallyInitializedStaticMutex->unlock();
+}
 
 static ThreadIdentifier mainThreadIdentifier;