Changeset 43663 in webkit for trunk/JavaScriptCore/wtf/CrossThreadRefCounted.h

Timestamp:

May 13, 2009, 3:09:21 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
• bytecode/SamplingTool.cpp: (JSC::SamplingThread::start): (JSC::SamplingThread::stop):
• bytecode/SamplingTool.h:
• wtf/CrossThreadRefCounted.h: (WTF::CrossThreadRefCounted::CrossThreadRefCounted): (WTF::::ref): (WTF::::deref):
• wtf/Threading.h:
• wtf/ThreadingNone.cpp:
• wtf/ThreadingPthreads.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::identifierByPthreadHandle): (WTF::establishIdentifierForPthreadHandle): (WTF::pthreadHandleForIdentifier): (WTF::clearPthreadHandleForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::detachThread): (WTF::currentThread):
• wtf/ThreadingWin.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::storeThreadHandleByIdentifier): (WTF::threadHandleForIdentifier): (WTF::clearThreadHandleForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::detachThread): (WTF::currentThread):
• wtf/gtk/ThreadingGtk.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::identifierByGthreadHandle): (WTF::establishIdentifierForThread): (WTF::threadForIdentifier): (WTF::clearThreadForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::currentThread):
• wtf/qt/ThreadingQt.cpp: (WTF::threadMapMutex): (WTF::threadMap): (WTF::identifierByQthreadHandle): (WTF::establishIdentifierForThread): (WTF::clearThreadForIdentifier): (WTF::threadForIdentifier): (WTF::initializeThreading): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::currentThread):

WebCore:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

• dom/XMLTokenizerLibxml2.cpp: (WebCore::matchFunc): (WebCore::openFunc): (WebCore::createStringParser): (WebCore::createMemoryParser):
• loader/icon/IconDatabase.cpp: (WebCore::IconDatabase::open):
• platform/sql/SQLiteDatabase.cpp: (WebCore::SQLiteDatabase::SQLiteDatabase): (WebCore::SQLiteDatabase::close):
• storage/DatabaseThread.cpp: (WebCore::DatabaseThread::DatabaseThread): (WebCore::DatabaseThread::start): (WebCore::DatabaseThread::databaseThread):
• storage/LocalStorageThread.cpp: (WebCore::LocalStorageThread::LocalStorageThread): (WebCore::LocalStorageThread::start): (WebCore::LocalStorageThread::localStorageThread): (WebCore::LocalStorageThread::scheduleImport): (WebCore::LocalStorageThread::scheduleSync): (WebCore::LocalStorageThread::terminate):
• workers/WorkerThread.cpp: (WebCore::WorkerThread::WorkerThread): (WebCore::WorkerThread::start):

WebKit/win:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

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

File:

• trunk/JavaScriptCore/wtf/CrossThreadRefCounted.h (modified) (5 diffs)

trunk/JavaScriptCore/wtf/CrossThreadRefCounted.h

@@ -75 +75 @@
             : m_threadSafeRefCounter(threadedCounter)
             , m_data(data)
+#ifndef NDEBUG
+            , m_threadId(0)
+#endif
         {
         }
@@ -97 +100 @@
     void CrossThreadRefCounted<T>::ref()
     {
-        ASSERT(!m_threadId.isValid() || m_threadId == currentThread());
+        ASSERT(!m_threadId || m_threadId == currentThread());
         m_refCounter.ref();
 #ifndef NDEBUG
@@ -105 +108 @@
         // is a heuristic but it seems to always work and has helped
         // find some bugs.
-        if (!m_threadId.isValid() && m_refCounter.refCount() == 2)
+        if (!m_threadId && m_refCounter.refCount() == 2)
             m_threadId = currentThread();
 #endif
@@ -113 +116 @@
     void CrossThreadRefCounted<T>::deref()
     {
-        ASSERT(!m_threadId.isValid() || m_threadId == currentThread());
+        ASSERT(!m_threadId || m_threadId == currentThread());
         if (m_refCounter.derefBase()) {
             threadSafeDeref();
@@ -122 +125 @@
             // is safe to be passed to another thread at this point.
             if (m_threadId && m_refCounter.refCount() == 1)
-                m_threadId.invalidate();
+                m_threadId = 0;
 #endif
         }