Changeset 41594 in webkit for trunk/JavaScriptCore/wtf/ThreadSpecificWin.cpp

Timestamp:

Mar 11, 2009, 1:39:21 PM (16 years ago)

Author:

Adam Roben

Message:

Change the Windows implementation of ThreadSpecific to use functions instead of extern globals

This will make it easier to export ThreadSpecific from WebKit.

Reviewed by John Sullivan.

• API/JSBase.cpp: (JSEvaluateScript): Touched this file to force ThreadSpecific.h to be copied into $WebKitOutputDir.

• wtf/ThreadSpecific.h: Replaced g_tls_key_count with tlsKeyCount() and g_tls_keys with tlsKeys().

(WTF::::ThreadSpecific):
(WTF::::~ThreadSpecific):
(WTF::::get):
(WTF::::set):
(WTF::::destroy):
Updated to use the new functions.

• wtf/ThreadSpecificWin.cpp: (WTF::tlsKeyCount): (WTF::tlsKeys): Added.

(WTF::ThreadSpecificThreadExit): Changed to use the new functions.

File:

• trunk/JavaScriptCore/wtf/ThreadSpecificWin.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/ThreadSpecificWin.cpp

@@ -30 +30 @@
 namespace WTF {
 
-long g_tls_key_count = 0;
-DWORD g_tls_keys[kMaxTlsKeySize];
+long& tlsKeyCount()
+{
+    static long count;
+    return count;
+}
+
+DWORD* tlsKeys()
+{
+    static DWORD keys[kMaxTlsKeySize];
+    return keys;
+}
 
 void ThreadSpecificThreadExit()
 {
-    for (long i = 0; i < g_tls_key_count; i++) {
+    for (long i = 0; i < tlsKeyCount(); i++) {
         // The layout of ThreadSpecific<T>::Data does not depend on T. So we are safe to do the static cast to ThreadSpecific<int> in order to access its data member.
-        ThreadSpecific<int>::Data* data = static_cast<ThreadSpecific<int>::Data*>(TlsGetValue(g_tls_keys[i]));
+        ThreadSpecific<int>::Data* data = static_cast<ThreadSpecific<int>::Data*>(TlsGetValue(tlsKeys()[i]));
         if (data)
             data->destructor(data);