<!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>[184072] trunk/Source/WTF</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/184072">184072</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 03:21:40 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] WorkQueue objects are not released
https://bugs.webkit.org/show_bug.cgi?id=144824
Reviewed by Žan Doberšek.
Do not keep a reference of the WorkQueue for the entire life of
its worker thread, since every task scheduled on the WorkQueue
already takes a reference. Instead, take a reference of the main
loop to make sure that when the worker thread starts, the main
loop hasn't been released to avoid runtime warnings (see
webkit.org/b/140998). Also removed the g_main_context_pop_thread_default()
from the thread body, since the thread-specific context queue will
be freed anyway when the thread exits.
If the WorkQueue is released early, before the thread has started,
schedule a main loop quit in the context, to make sure it will
be the first thing run by the main loop and the thread will exit.
* wtf/WorkQueue.h: Remove unused event loop mutex.
* wtf/gtk/WorkQueueGtk.cpp:
(WTF::WorkQueue::platformInitialize):
(WTF::WorkQueue::platformInvalidate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#trunkSourceWTFwtfgtkWorkQueueGtkcpp">trunk/Source/WTF/wtf/gtk/WorkQueueGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (184071 => 184072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-11 09:38:25 UTC (rev 184071)
+++ trunk/Source/WTF/ChangeLog 2015-05-11 10:21:40 UTC (rev 184072)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-11 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WorkQueue objects are not released
+ https://bugs.webkit.org/show_bug.cgi?id=144824
+
+ Reviewed by Žan Doberšek.
+
+ Do not keep a reference of the WorkQueue for the entire life of
+ its worker thread, since every task scheduled on the WorkQueue
+ already takes a reference. Instead, take a reference of the main
+ loop to make sure that when the worker thread starts, the main
+ loop hasn't been released to avoid runtime warnings (see
+ webkit.org/b/140998). Also removed the g_main_context_pop_thread_default()
+ from the thread body, since the thread-specific context queue will
+ be freed anyway when the thread exits.
+ If the WorkQueue is released early, before the thread has started,
+ schedule a main loop quit in the context, to make sure it will
+ be the first thing run by the main loop and the thread will exit.
+
+ * wtf/WorkQueue.h: Remove unused event loop mutex.
+ * wtf/gtk/WorkQueueGtk.cpp:
+ (WTF::WorkQueue::platformInitialize):
+ (WTF::WorkQueue::platformInvalidate):
+
</ins><span class="cx"> 2015-05-09 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Remove the PICTURE_SIZES build flag
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (184071 => 184072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2015-05-11 09:38:25 UTC (rev 184071)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2015-05-11 10:21:40 UTC (rev 184072)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> GRefPtr<GMainContext> m_eventContext;
</span><del>- Mutex m_eventLoopLock;
</del><span class="cx"> GRefPtr<GMainLoop> m_eventLoop;
</span><span class="cx"> GMainLoopSource m_socketEventSource;
</span><span class="cx"> #elif PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceWTFwtfgtkWorkQueueGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gtk/WorkQueueGtk.cpp (184071 => 184072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gtk/WorkQueueGtk.cpp 2015-05-11 09:38:25 UTC (rev 184071)
+++ trunk/Source/WTF/wtf/gtk/WorkQueueGtk.cpp 2015-05-11 10:21:40 UTC (rev 184072)
</span><span class="lines">@@ -55,11 +55,10 @@
</span><span class="cx"> if (strlen(threadName) > kVisualStudioThreadNameLimit)
</span><span class="cx"> threadName += strlen(threadName) - kVisualStudioThreadNameLimit;
</span><span class="cx">
</span><del>- RefPtr<WorkQueue> protector(this);
- m_workQueueThread = createThread(threadName, [protector] {
- g_main_context_push_thread_default(protector->m_eventContext.get());
- g_main_loop_run(protector->m_eventLoop.get());
- g_main_context_pop_thread_default(protector->m_eventContext.get());
</del><ins>+ GRefPtr<GMainLoop> eventLoop(m_eventLoop.get());
+ m_workQueueThread = createThread(threadName, [eventLoop] {
+ g_main_context_push_thread_default(g_main_loop_get_context(eventLoop.get()));
+ g_main_loop_run(eventLoop.get());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,14 +69,19 @@
</span><span class="cx"> m_workQueueThread = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- MutexLocker locker(m_eventLoopLock);
</del><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><del>- m_eventLoop.clear();
</del><ins>+ else {
+ // The thread hasn't started yet, so schedule a main loop quit to ensure the thread finishes.
+ GMainLoop* eventLoop = m_eventLoop.get();
+ GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] WorkQueue quit main loop", [eventLoop] { g_main_loop_quit(eventLoop); },
+ G_PRIORITY_HIGH, nullptr, m_eventContext.get());
+ }
+ m_eventLoop = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_eventContext.clear();
</del><ins>+ m_eventContext = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkQueue::registerSocketEventHandler(int fileDescriptor, std::function<void ()> function, std::function<void ()> closeFunction)
</span></span></pre>
</div>
</div>
</body>
</html>