Changeset 101825 in webkit

Timestamp:

Dec 2, 2011 10:34:37 AM (12 years ago)

Author:

Darin Adler

Message:

[Mac] Form stream data structures still not threadsafe
​https://bugs.webkit.org/show_bug.cgi?id=73674

Reviewed by Anders Carlsson.

• platform/network/mac/FormDataStreamMac.mm:

(WebCore::streamFieldsMapMutex): Added.
(WebCore::associateStreamWithResourceHandle): Use streamFieldsMapMutex.
(WebCore::formCreate): Ditto.
(WebCore::formFinalize): Ditto.
(WebCore::httpBodyFromStream): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/FormDataStreamMac.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-02  Darin Adler  <darin@apple.com>
+
+        [Mac] Form stream data structures still not threadsafe
+        https://bugs.webkit.org/show_bug.cgi?id=73674
+
+        Reviewed by Anders Carlsson.
+
+        * platform/network/mac/FormDataStreamMac.mm:
+        (WebCore::streamFieldsMapMutex): Added. 
+        (WebCore::associateStreamWithResourceHandle): Use streamFieldsMapMutex.
+        (WebCore::formCreate): Ditto.
+        (WebCore::formFinalize): Ditto.
+        (WebCore::httpBodyFromStream): Ditto.
+
 2011-12-02  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm

@@ -57 +57 @@
 namespace WebCore {
 
-// We need to use NSMapTable instead of HashMap since this needs to be accessed from more than one thread.
+static Mutex& streamFieldsMapMutex()
+{
+    DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
+    return staticMutex;
+}
+
 static NSMapTable *streamFieldsMap()
 {
@@ -80 +85 @@
         return;
 
-    if (!NSMapGet(streamFieldsMap(), stream))
-        return;
+    {
+        MutexLocker locker(streamFieldsMapMutex());
+        if (!NSMapGet(streamFieldsMap(), stream))
+            return;
+    }
 
     ASSERT(!getStreamResourceHandleMap().contains((CFReadStreamRef)stream));
@@ -248 +256 @@
         newInfo->remainingElements.append(newInfo->formData->elements()[size - i - 1]);
 
+    MutexLocker locker(streamFieldsMapMutex());
     ASSERT(!NSMapGet(streamFieldsMap(), stream));
     NSMapInsertKnownAbsent(streamFieldsMap(), stream, newInfo);
@@ -264 +273 @@
 {
     FormStreamFields* form = static_cast<FormStreamFields*>(context);
+
+    MutexLocker locker(streamFieldsMapMutex());
 
     ASSERT(form->formStream == stream);
@@ -497 +508 @@
 FormData* httpBodyFromStream(NSInputStream* stream)
 {
+    MutexLocker locker(streamFieldsMapMutex());
     FormStreamFields* formStream = static_cast<FormStreamFields*>(NSMapGet(streamFieldsMap(), stream));
     if (!formStream)