Changeset 126379 in webkit

Timestamp:

Aug 22, 2012, 6:33:25 PM (13 years ago)

Author:

ggaren@apple.com

Message:

ThreadRestrictionVerifier should be opt-in, not opt-out
​https://bugs.webkit.org/show_bug.cgi?id=94761

Reviewed by Mark Hahnenberg.

../JavaScriptCore:

Removed explicit calls to disable the verifier, since it's off by default now.

• parser/SourceProvider.h:

(JSC::SourceProvider::SourceProvider):
(SourceProvider):

• runtime/SymbolTable.h:

(JSC::SharedSymbolTable::SharedSymbolTable):

../WTF:

WebKit's JavaScript engine supports use on multiple threads, so default-on
is not appropriate for most of our objects, and it causes lots of suprious
assertions.

• wtf/MetaAllocator.cpp:

(WTF::MetaAllocatorHandle::MetaAllocatorHandle): No need to turn off
explicitly, since it's off by default now.

• wtf/ThreadRestrictionVerifier.h:

(WTF::ThreadRestrictionVerifier::ThreadRestrictionVerifier): Turn off by default.

(WTF::ThreadRestrictionVerifier::setMutexMode):
(WTF::ThreadRestrictionVerifier::setDispatchQueueMode):
(WTF::ThreadRestrictionVerifier::turnOffVerification): These assertions
about state transitions were inconsistent with each other, and impossible
to maintain with default off, so I removed them.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/parser/SourceProvider.h (modified) (1 diff)
• JavaScriptCore/runtime/SymbolTable.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MetaAllocator.cpp (modified) (1 diff)
• WTF/wtf/ThreadRestrictionVerifier.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-08-22  Geoffrey Garen  <ggaren@apple.com>
+
+        ThreadRestrictionVerifier should be opt-in, not opt-out
+        https://bugs.webkit.org/show_bug.cgi?id=94761
+
+        Reviewed by Mark Hahnenberg.
+
+        Removed explicit calls to disable the verifier, since it's off by default now.
+
+        * parser/SourceProvider.h:
+        (JSC::SourceProvider::SourceProvider):
+        (SourceProvider):
+        * runtime/SymbolTable.h:
+        (JSC::SharedSymbolTable::SharedSymbolTable):
+
 2012-08-22  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -50 +50 @@
             , m_cacheOwned(!cache)
         {
-            turnOffVerifier();
         }
+
         virtual ~SourceProvider()
         {

trunk/Source/JavaScriptCore/runtime/SymbolTable.h

@@ -331 +331 @@
         static PassRefPtr<SharedSymbolTable> create() { return adoptRef(new SharedSymbolTable); }
     private:
-        SharedSymbolTable() { turnOffVerifier(); }
+        SharedSymbolTable() { }
     };
     

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-08-22  Geoffrey Garen  <ggaren@apple.com>
+
+        ThreadRestrictionVerifier should be opt-in, not opt-out
+        https://bugs.webkit.org/show_bug.cgi?id=94761
+
+        Reviewed by Mark Hahnenberg.
+
+        WebKit's JavaScript engine supports use on multiple threads, so default-on
+        is not appropriate for most of our objects, and it causes lots of suprious
+        assertions.
+
+        * wtf/MetaAllocator.cpp:
+        (WTF::MetaAllocatorHandle::MetaAllocatorHandle): No need to turn off
+        explicitly, since it's off by default now.
+
+        * wtf/ThreadRestrictionVerifier.h:
+        (WTF::ThreadRestrictionVerifier::ThreadRestrictionVerifier): Turn off by default.
+
+        (WTF::ThreadRestrictionVerifier::setMutexMode):
+        (WTF::ThreadRestrictionVerifier::setDispatchQueueMode):
+        (WTF::ThreadRestrictionVerifier::turnOffVerification): These assertions
+        about state transitions were inconsistent with each other, and impossible
+        to maintain with default off, so I removed them.
+
 2012-08-22  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WTF/wtf/MetaAllocator.cpp

@@ -80 +80 @@
     ASSERT(start);
     ASSERT(sizeInBytes);
-    turnOffVerifier();
 }
 

trunk/Source/WTF/wtf/ThreadRestrictionVerifier.h

@@ -51 +51 @@
 public:
     ThreadRestrictionVerifier()
+#if USE(JSC)
+        : m_mode(NoVerificationMode)
+#else
         : m_mode(SingleThreadVerificationMode)
+#endif
         , m_shared(false)
         , m_owningThread(0)
@@ -71 +75 @@
     void setMutexMode(Mutex& mutex)
     {
-        ASSERT(m_mode == SingleThreadVerificationMode || (m_mode == MutexVerificationMode && &mutex == m_mutex));
         m_mode = MutexVerificationMode;
         m_mutex = &mutex;
@@ -79 +82 @@
     void setDispatchQueueMode(dispatch_queue_t queue)
     {
-        ASSERT(m_mode == SingleThreadVerificationMode);
         m_mode = SingleDispatchQueueVerificationMode;
         m_owningQueue = queue;
@@ -88 +90 @@
     void turnOffVerification()
     {
-        ASSERT(m_mode == SingleThreadVerificationMode);
         m_mode = NoVerificationMode;
     }