<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179395] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179395">179395</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-29 23:23:00 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Runtime critical warnings sometimes at start up when using the network process
https://bugs.webkit.org/show_bug.cgi?id=140998
Reviewed by Žan Doberšek.
This is caused by the CustomProtocolManager work queue
theread. This WorkQueue is created when the CustomProtocolManager
object is constructed, but destroyed when it's initialized when
the UI process asks to use the network process. In this case,
sometimes happens that the work queue thread that runs the main
loop is executed once the object has been destroyed and the main
loop pointer is nullptr.
* Platform/WorkQueue.h:
* Platform/gtk/WorkQueueGtk.cpp:
(WorkQueue::platformInitialize): Use a lambda function for the
thread body.
(WorkQueue::platformInvalidate): Detach the worker thread before
deleting the main loop object.
(WorkQueue::startWorkQueueThread): Deleted.
(WorkQueue::workQueueThreadBody): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformWorkQueueh">trunk/Source/WebKit2/Platform/WorkQueue.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp">trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179394 => 179395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-30 06:44:51 UTC (rev 179394)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-30 07:23:00 UTC (rev 179395)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Runtime critical warnings sometimes at start up when using the network process
+ https://bugs.webkit.org/show_bug.cgi?id=140998
+
+ Reviewed by Žan Doberšek.
+
+ This is caused by the CustomProtocolManager work queue
+ theread. This WorkQueue is created when the CustomProtocolManager
+ object is constructed, but destroyed when it's initialized when
+ the UI process asks to use the network process. In this case,
+ sometimes happens that the work queue thread that runs the main
+ loop is executed once the object has been destroyed and the main
+ loop pointer is nullptr.
+
+ * Platform/WorkQueue.h:
+ * Platform/gtk/WorkQueueGtk.cpp:
+ (WorkQueue::platformInitialize): Use a lambda function for the
+ thread body.
+ (WorkQueue::platformInvalidate): Detach the worker thread before
+ deleting the main loop object.
+ (WorkQueue::startWorkQueueThread): Deleted.
+ (WorkQueue::workQueueThreadBody): Deleted.
+
</ins><span class="cx"> 2015-01-29 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Another follow-on, spotted this mistake. This used to be
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/WorkQueue.h (179394 => 179395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/WorkQueue.h 2015-01-30 06:44:51 UTC (rev 179394)
+++ trunk/Source/WebKit2/Platform/WorkQueue.h 2015-01-30 07:23:00 UTC (rev 179395)
</span><span class="lines">@@ -88,9 +88,6 @@
</span><span class="cx"> static void executeFunction(void*);
</span><span class="cx"> dispatch_queue_t m_dispatchQueue;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- static void startWorkQueueThread(WorkQueue*);
- void workQueueThreadBody();
-
</del><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> GRefPtr<GMainContext> m_eventContext;
</span><span class="cx"> Mutex m_eventLoopLock;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (179394 => 179395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2015-01-30 06:44:51 UTC (rev 179394)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2015-01-30 07:23:00 UTC (rev 179395)
</span><span class="lines">@@ -52,13 +52,18 @@
</span><span class="cx"> if (strlen(threadName) > kVisualStudioThreadNameLimit)
</span><span class="cx"> threadName += strlen(threadName) - kVisualStudioThreadNameLimit;
</span><span class="cx">
</span><del>- m_workQueueThread = createThread(reinterpret_cast<WTF::ThreadFunction>(&WorkQueue::startWorkQueueThread), this, threadName);
</del><ins>+ RefPtr<WorkQueue> protector(this);
+ m_workQueueThread = createThread(threadName, [protector] { g_main_loop_run(protector->m_eventLoop.get()); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkQueue::platformInvalidate()
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_eventLoopLock);
</del><ins>+ if (m_workQueueThread) {
+ detachThread(m_workQueueThread);
+ m_workQueueThread = 0;
+ }
</ins><span class="cx">
</span><ins>+ MutexLocker locker(m_eventLoopLock);
</ins><span class="cx"> if (m_eventLoop) {
</span><span class="cx"> if (g_main_loop_is_running(m_eventLoop.get()))
</span><span class="cx"> g_main_loop_quit(m_eventLoop.get());
</span><span class="lines">@@ -68,16 +73,6 @@
</span><span class="cx"> m_eventContext.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::startWorkQueueThread(WorkQueue* workQueue)
-{
- workQueue->workQueueThreadBody();
-}
-
-void WorkQueue::workQueueThreadBody()
-{
- g_main_loop_run(m_eventLoop.get());
-}
-
</del><span class="cx"> void WorkQueue::registerSocketEventHandler(int fileDescriptor, std::function<void ()> function, std::function<void ()> closeFunction)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GSocket> socket = adoptGRef(g_socket_new_from_fd(fileDescriptor, 0));
</span></span></pre>
</div>
</div>
</body>
</html>