Changeset 39604 in webkit for trunk/JavaScriptCore/wtf/ThreadSpecific.h

Timestamp:

Jan 5, 2009, 10:13:05 AM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=23073
<rdar://problem/6471129> Workers crash on Windows Release builds

JavaScriptCore:

• wtf/ThreadSpecific.h: (WTF::ThreadSpecific::destroy): Changed to clear the pointer only after data object destruction is finished - otherwise, WebCore::ThreadGlobalData destructor was re-creating the object in order to access atomic string table. (WTF::ThreadSpecific::operator T*): Symmetrically, set up the per-thread pointer before data constructor is called.

• wtf/ThreadingWin.cpp: (WTF::wtfThreadEntryPoint): Remove a Windows-only hack to finalize a thread - pthreadVC2 is a DLL, so it gets thread detached messages, and cleans up thread specific data automatically. Besides, this code wasn't even compiled in for some time now.

WebCore:

• platform/ThreadGlobalData.cpp: (WebCore::ThreadGlobalData::ThreadGlobalData):
• platform/ThreadGlobalData.h: (WebCore::ThreadGlobalData::eventNames): Now that ThreadSpecific sets up the pointer before invoking data constructor, we can initialize EventNames right away.

File:

• trunk/JavaScriptCore/wtf/ThreadSpecific.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/ThreadSpecific.h

@@ -98 +98 @@
 {
     Data* data = static_cast<Data*>(ptr);
+    data->value->~T();
+    fastFree(data->value);
+    // Only reset the pointer after value destructor finishes - otherwise, code in destructor could trigger
+    // re-creation of the object.
     pthread_setspecific(data->owner->m_key, 0);
-    delete data->value;
     delete data;
 }
@@ -112 +115 @@
     T* ptr = static_cast<T*>(get());
     if (!ptr) {
-        ptr = new T();
+        // Set up thread-specific value's memory pointer before invoking constructor, in case any function it calls
+        // needs to access the value, to avoid recursion.
+        ptr = static_cast<T*>(fastMalloc(sizeof(T)));
         set(ptr);
+        new (ptr) T;
     }
     return ptr;