Changeset 63912 in webkit

Timestamp:

Jul 22, 2010 2:25:13 PM (14 years ago)

Author:

Adam Roben

Message:

Make WorkQueue aware of potential errors with ::WaitForMultipleObjects

Fixes <​http://webkit.org/b/42846> WorkQueue should detect
::WaitForMultipleObject failures

Reviewed by Anders Carlsson.

• Platform/win/WorkQueueWin.cpp:

(WorkQueue::workQueueThreadBody): Added some assertions about the
various things that can fail with ::WaitForMultipleObjects,
specifically:

• Passing too many objects
• Timeouts (which shouldn't happen since we pass a timeout interval of INFINITE)
• Abandoned mutexes (which shouldn't happen since we don't wait on any mutexes currently)
• Miscellaneous failures

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/win/WorkQueueWin.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-22  Adam Roben  <aroben@apple.com>
+
+        Make WorkQueue aware of potential errors with ::WaitForMultipleObjects
+
+        Fixes <http://webkit.org/b/42846> WorkQueue should detect
+        ::WaitForMultipleObject failures
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/win/WorkQueueWin.cpp:
+        (WorkQueue::workQueueThreadBody): Added some assertions about the
+        various things that can fail with ::WaitForMultipleObjects,
+        specifically:
+          - Passing too many objects
+          - Timeouts (which shouldn't happen since we pass a timeout interval
+            of INFINITE)
+          - Abandoned mutexes (which shouldn't happen since we don't wait on
+            any mutexes currently)
+          - Miscellaneous failures
+
 2010-07-22  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/Platform/win/WorkQueueWin.cpp

@@ -60 +60 @@
         handles.append(m_performWorkEvent);
 
+        ASSERT(handles.size() <= MAXIMUM_WAIT_OBJECTS);
+
         // Now we wait.
         DWORD result = ::WaitForMultipleObjects(handles.size(), handles.data(), FALSE, INFINITE);
+        if (result == WAIT_FAILED) {
+            DWORD error = ::GetLastError();
+            ASSERT_NOT_REACHED();
+        }
+
+        // The wait should never time out since we passed INFINITE for the timeout interval.
+        ASSERT(result != WAIT_TIMEOUT);
+        // We don't know how (or need) to handle abandoned mutexes yet.
+        ASSERT(result < WAIT_ABANDONED_0 || result >= WAIT_ABANDONED_0 + handles.size());
 
         if (result == handles.size() - 1)