<table><tr><td style="">dvratil requested changes to this revision.<br />dvratil added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D7115" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p><tt style="background: #ebebeb; font-size: 13px;">SearchManager::updateSearch()</tt> can be called from arbitrary thread, but it's important that <tt style="background: #ebebeb; font-size: 13px;">SearchManager::updateSearchImpl()</tt> is executed in <tt style="background: #ebebeb; font-size: 13px;">SearchManager</tt>'s thread, your change break this. We should probably add <tt style="background: #ebebeb; font-size: 13px;">Q_ASSERT(QThread::currentThread() == thread());</tt> at the beginning of <tt style="background: #ebebeb; font-size: 13px;">updateSearchImpl()</tt> and properly documented the requirement (it's not very obvious from the comment in the header).</p>

<p>Also good point with the FIXME, probably need to do something like storing a <tt style="background: #ebebeb; font-size: 13px;">QWaitCondition</tt>s in the <tt style="background: #ebebeb; font-size: 13px;">mUpdatingCollections</tt> vector so that others can wait and be notified when the search is finished.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D7115#inline-29020" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">searchmanager.cpp:273</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="n">QMetaObject</span><span style="color: #aa2211">::</span><span class="n">invokeMethod</span><span class="p">(</span><span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #766510">"updateSearchImpl"</span><span class="p">,</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">                              <span class="n">Qt</span><span style="color: #aa2211">::</span><span class="n">QueuedConnection</span><span class="p">,</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">                              <span class="n">Q_ARG</span><span class="p">(</span><span class="n">Collection</span><span class="p">,</span> <span class="n">collection</span><span class="p">),</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Replace <tt style="background: #ebebeb; font-size: 13px;">Qt::QueuedConnection</tt> by <tt style="background: #ebebeb; font-size: 13px;">Qt::BlockingQueuedConnection</tt> and you can still remove the <tt style="background: #ebebeb; font-size: 13px;">QSemaphore</tt>. No idea why I did not use that in the first place... :-)</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R165 Akonadi </div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D7115" rel="noreferrer">https://phabricator.kde.org/D7115</a></div></div><br /><div><strong>To: </strong>dkurz, KDE PIM, dvratil<br /><strong>Cc: </strong>dvratil, dvasin, winterz, vkrause, mlaurent, knauss<br /></div>