Changeset 71409 in webkit

Timestamp:

Nov 5, 2010 5:03:50 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

[Qt][WK2] Left over files and shared memory segments
​https://bugs.webkit.org/show_bug.cgi?id=48985

Reviewed by Andreas Kling.

• Platform/qt/SharedMemoryQt.cpp:

(WebKit::SharedMemory::create): Force deletion of the QSharedMemory
object on terminate by connecting QCoreApplication::aboutToQuit with
deleteLater. Add the object to the CrashHandler as well to release the
shared memory segment even on crash.
(WebKit::SharedMemory::~SharedMemory):

• Shared/qt/CrashHandler.cpp: Added.

CrashHandler has a container for QObjects that we want to
destroy on crash. When we got a signal that we interpret as
a crash then it destroys those objects.
(WebKit::CrashHandler::CrashHandler):
(WebKit::CrashHandler::signalHandler):
(WebKit::CrashHandler::deleteObjects):

• Shared/qt/CrashHandler.h: Added.

(WebKit::CrashHandler::instance):
(WebKit::CrashHandler::didDelete):
(WebKit::CrashHandler::markForDeletionOnCrash):

• UIProcess/Launcher/qt/ProcessLauncherQt.cpp:

(WebKit::ProcessLauncherHelper::ProcessLauncherHelper):
Add the object itself to the CrashHandler to close the QLocalServer
even on crash. Without that the QLocalServer leaves over socket files on the disk.
(WebKit::ProcessLauncherHelper::~ProcessLauncherHelper):

• WebKit2.pro:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/qt/SharedMemoryQt.cpp (modified) (4 diffs)
• Shared/qt/CrashHandler.cpp (added)
• Shared/qt/CrashHandler.h (added)
• UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (3 diffs)
• WebKit2.pro (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-05  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Left over files and shared memory segments
+        https://bugs.webkit.org/show_bug.cgi?id=48985
+
+        * Platform/qt/SharedMemoryQt.cpp:
+        (WebKit::SharedMemory::create): Force deletion of the QSharedMemory
+        object on terminate by connecting QCoreApplication::aboutToQuit with
+        deleteLater. Add the object to the CrashHandler as well to release the
+        shared memory segment even on crash.
+        (WebKit::SharedMemory::~SharedMemory):
+        * Shared/qt/CrashHandler.cpp: Added.
+        CrashHandler has a container for QObjects that we want to
+        destroy on crash. When we got a signal that we interpret as
+        a crash then it destroys those objects.
+        (WebKit::CrashHandler::CrashHandler):
+        (WebKit::CrashHandler::signalHandler):
+        (WebKit::CrashHandler::deleteObjects):
+        * Shared/qt/CrashHandler.h: Added.
+        (WebKit::CrashHandler::instance):
+        (WebKit::CrashHandler::didDelete):
+        (WebKit::CrashHandler::markForDeletionOnCrash):
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncherHelper::ProcessLauncherHelper):
+        Add the object itself to the CrashHandler to close the QLocalServer
+        even on crash. Without that the QLocalServer leaves over socket files on the disk.
+        (WebKit::ProcessLauncherHelper::~ProcessLauncherHelper):
+        * WebKit2.pro:
+
 2010-11-04  Jia Pu  <jpu@apple.com>
 

trunk/WebKit2/Platform/qt/SharedMemoryQt.cpp

@@ -30 +30 @@
 #include "ArgumentDecoder.h"
 #include "ArgumentEncoder.h"
+#include "CrashHandler.h"
 #include "WebCoreArgumentCoders.h"
 #include <unistd.h>
+#include <QCoreApplication>
 #include <QLatin1String>
 #include <QSharedMemory>
@@ -93 +95 @@
     bool created = impl->create(size);
     ASSERT_UNUSED(created, created);
+
     sharedMemory->m_impl = impl;
     sharedMemory->m_size = size;
     sharedMemory->m_data = impl->data();
+
+    impl->connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(deleteLater()));
+
+    // Release the shared memory segment even on crash!
+    CrashHandler::instance()->markForDeletionOnCrash(impl);
 
     return sharedMemory.release();
@@ -122 +130 @@
     bool attached = impl->attach(accessMode(protection));
     ASSERT_UNUSED(attached, attached);
+
     sharedMemory->m_impl = impl;
     ASSERT(handle.m_size == impl->size());
     sharedMemory->m_size = handle.m_size;
     sharedMemory->m_data = impl->data();
+
+    impl->connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(deleteLater()));
+
+    // Release the shared memory segment even on crash!
+    CrashHandler::instance()->markForDeletionOnCrash(impl);
 
     return sharedMemory.release();
@@ -135 +149 @@
     ASSERT(qobject_cast<QSharedMemory*>(m_impl));
     delete m_impl;
+    CrashHandler::instance()->didDelete(m_impl);
 }
 

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

@@ -30 +30 @@
 #include "NotImplemented.h"
 #include "RunLoop.h"
+#include "CrashHandler.h"
 #include "WebProcess.h"
 #include <runtime/InitializeThreading.h>
@@ -103 +104 @@
 {
     m_server.close();
+    CrashHandler::instance()->didDelete(this);
 }
 
@@ -114 +116 @@
     connect(&m_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
     connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(deleteLater()), Qt::QueuedConnection);
+
+    // Do not leave socket files on the disk even on crash!
+    CrashHandler::instance()->markForDeletionOnCrash(this);
 }
 

trunk/WebKit2/WebKit2.pro

@@ -214 +214 @@
     Shared/NotImplemented.h \
     Shared/StringPairVector.h \
+    Shared/qt/CrashHandler.h \
     Shared/qt/PlatformCertificateInfo.h \
     Shared/qt/UpdateChunk.h \
@@ -380 +381 @@
     Shared/MutableDictionary.cpp \
     Shared/qt/BackingStoreQt.cpp \
+    Shared/qt/CrashHandler.cpp \
     Shared/qt/NativeWebKeyboardEventQt.cpp \
     Shared/qt/UpdateChunk.cpp \