Changeset 151825 in webkit

Timestamp:

Jun 20, 2013 11:02:58 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2] Looping for EINTR on close() is incorrect for Linux, at least
​https://bugs.webkit.org/show_bug.cgi?id=117266

Patch by Sergio Correia <Sergio Correia> on 2013-06-20
Reviewed by Darin Adler.

Source/WebKit2:

Call closeWithRetry() to work around a difference in how the retry needs to
be done on Linux.

• Platform/CoreIPC/unix/AttachmentUnix.cpp:

(CoreIPC::Attachment::dispose):

• Platform/CoreIPC/unix/ConnectionUnix.cpp:

(CoreIPC::Connection::platformInvalidate):

• Platform/unix/SharedMemoryUnix.cpp:

(WebKit::SharedMemory::Handle::~Handle):
(WebKit::SharedMemory::create):
(WebKit::SharedMemory::~SharedMemory):
(WebKit::SharedMemory::createHandle):

• PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::createWebProcessConnection):

• SharedWorkerProcess/SharedWorkerProcess.cpp:

(WebKit::SharedWorkerProcess::createWebProcessConnection):

• UIProcess/Launcher/qt/ProcessLauncherQt.cpp:

(WebKit::ProcessLauncher::launchProcess): All these places had
close-followed-by-EINTR-handling replaced with the new closeWithRetry()
function added in this commit.

Source/WTF:

Added file UniStdExtras with a closeWithRetry() function that works around
the EINTR behavior on Linux during a close() call: it closes the descriptor
unconditionally even when the call is interrupted.

• wtf/UniStdExtras.h: Added.

(WTF::closeWithRetry): Wrapper around POSIX close() that handles EINTR
correctly.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/UniStdExtras.h (added)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp (modified) (2 diffs)
• WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (modified) (2 diffs)
• WebKit2/Platform/unix/SharedMemoryUnix.cpp (modified) (6 diffs)
• WebKit2/PluginProcess/PluginProcess.cpp (modified) (3 diffs)
• WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp (modified) (3 diffs)
• WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-06-20  Sergio Correia  <sergio.correia@openbossa.org>
+
+        [WK2] Looping for EINTR on close() is incorrect for Linux, at least
+        https://bugs.webkit.org/show_bug.cgi?id=117266
+
+        Reviewed by Darin Adler.
+
+        Added file UniStdExtras with a closeWithRetry() function that works around
+        the EINTR behavior on Linux during a close() call: it closes the descriptor
+        unconditionally even when the call is interrupted.
+
+        * wtf/UniStdExtras.h: Added.
+        (WTF::closeWithRetry): Wrapper around POSIX close() that handles EINTR
+        correctly.
+
 2013-06-20  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-20  Sergio Correia  <sergio.correia@openbossa.org>
+
+        [WK2] Looping for EINTR on close() is incorrect for Linux, at least
+        https://bugs.webkit.org/show_bug.cgi?id=117266
+
+        Reviewed by Darin Adler.
+
+        Call closeWithRetry() to work around a difference in how the retry needs to
+        be done on Linux.
+
+        * Platform/CoreIPC/unix/AttachmentUnix.cpp:
+        (CoreIPC::Attachment::dispose):
+        * Platform/CoreIPC/unix/ConnectionUnix.cpp:
+        (CoreIPC::Connection::platformInvalidate):
+        * Platform/unix/SharedMemoryUnix.cpp:
+        (WebKit::SharedMemory::Handle::~Handle):
+        (WebKit::SharedMemory::create):
+        (WebKit::SharedMemory::~SharedMemory):
+        (WebKit::SharedMemory::createHandle):
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::PluginProcess::createWebProcessConnection):
+        * SharedWorkerProcess/SharedWorkerProcess.cpp:
+        (WebKit::SharedWorkerProcess::createWebProcessConnection):
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncher::launchProcess): All these places had
+        ``close-followed-by-EINTR-handling'' replaced with the new closeWithRetry()
+        function added in this commit.
+
 2013-06-20  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp

@@ -28 +28 @@
 #include "Attachment.h"
 
-#include <unistd.h>
-#include <errno.h>
+#include <wtf/UniStdExtras.h>
 
 namespace CoreIPC {
@@ -50 +49 @@
 {
     if (m_fileDescriptor != -1)
-        while (close(m_fileDescriptor) == -1 && (errno == EINTR)) { }
+        closeWithRetry(m_fileDescriptor);
 }
 

trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp

@@ -38 +38 @@
 #include <wtf/Functional.h>
 #include <wtf/OwnArrayPtr.h>
+#include <wtf/UniStdExtras.h>
 
 #if PLATFORM(QT)
@@ -137 +138 @@
 #if !PLATFORM(GTK)
     if (m_socketDescriptor != -1)
-        while (close(m_socketDescriptor) == -1 && errno == EINTR) { }
+        closeWithRetry(m_socketDescriptor);
 #endif
 

trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

@@ -42 +42 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/RandomNumber.h>
+#include <wtf/UniStdExtras.h>
 #include <wtf/text/CString.h>
 
@@ -55 +56 @@
 {
     if (!isNull())
-        while (close(m_fileDescriptor) == -1 && errno == EINTR) { }
+        closeWithRetry(m_fileDescriptor);
 }
 
@@ -117 +118 @@
     while (ftruncate(fileDescriptor, size) == -1) {
         if (errno != EINTR) {
-            while (close(fileDescriptor) == -1 && errno == EINTR) { }
+            closeWithRetry(fileDescriptor);
             shm_unlink(tempName.data());
             return 0;
@@ -125 +126 @@
     void* data = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileDescriptor, 0);
     if (data == MAP_FAILED) {
-        while (close(fileDescriptor) == -1 && errno == EINTR) { }
+        closeWithRetry(fileDescriptor);
         shm_unlink(tempName.data());
         return 0;
@@ -171 +172 @@
 {
     munmap(m_data, m_size);
-    while (close(m_fileDescriptor) == -1 && errno == EINTR) { }
+    closeWithRetry(m_fileDescriptor);
 }
 
@@ -203 +204 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(duplicatedHandle) == -1 && errno == EINTR) { }
+            closeWithRetry(duplicatedHandle);
             return false;
         }

trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

@@ -51 +51 @@
 #include <sys/socket.h>
 #include <unistd.h>
+#include <wtf/UniStdExtras.h>
 
 #ifdef SOCK_SEQPACKET
@@ -193 +194 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(sockets[0]) == -1 && errno == EINTR) { }
-            while (close(sockets[1]) == -1 && errno == EINTR) { }
+            closeWithRetry(sockets[0]);
+            closeWithRetry(sockets[1]);
             return;
         }
@@ -203 +204 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(sockets[0]) == -1 && errno == EINTR) { }
-            while (close(sockets[1]) == -1 && errno == EINTR) { }
+            closeWithRetry(sockets[0]);
+            closeWithRetry(sockets[1]);
             return;
         }

trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp

@@ -47 +47 @@
 #include <sys/socket.h>
 #include <unistd.h>
+#include <wtf/UniStdExtras.h>
 
 #ifdef SOCK_SEQPACKET
@@ -140 +141 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(sockets[0]) == -1 && errno == EINTR) { }
-            while (close(sockets[1]) == -1 && errno == EINTR) { }
+            closeWithRetry(sockets[0]);
+            closeWithRetry(sockets[1]);
             return;
         }
@@ -150 +151 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(sockets[0]) == -1 && errno == EINTR) { }
-            while (close(sockets[1]) == -1 && errno == EINTR) { }
+            closeWithRetry(sockets[0]);
+            closeWithRetry(sockets[1]);
             return;
         }

trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

@@ -51 +51 @@
 #include <sys/socket.h>
 #include <unistd.h>
+#include <wtf/UniStdExtras.h>
 #endif
 
@@ -163 +164 @@
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
-            while (close(sockets[0]) == -1 && errno == EINTR) { }
-            while (close(sockets[1]) == -1 && errno == EINTR) { }
+            closeWithRetry(sockets[0]);
+            closeWithRetry(sockets[1]);
             return;
         }