<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure 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/D13627">View Revision</a></tr></table><br /><div><div><p>This is the wrong approach for thread safety (wrong level of locking). It should come with a multithreaded unittest so it can be checked for safety (with clang+tsan for instance). And yes the concept overall seems wrong anyway as QIcon isn't threadsafe in the first place, AFAIK.</p>

<p>A separate KIconLoader instance, used only to fetch paths and not icons, could possibly be used in a secondary thread, but only that. In which case the fix would look very different from this.</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/D13627#inline-71511">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kiconloader.cpp:616</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="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">mIconCache</span><span style="color: #aa2211">-></span><span class="n">clear</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">clear</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">init</span><span class="p">(</span><span class="n">_appname</span><span class="p">,</span> <span class="n">extraSearchPaths</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">mIconCache</span><span style="color: #aa2211">-></span><span class="n">clear</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">clear</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">init</span><span class="p">(</span><span class="n">_appname</span><span class="p">,</span> <span class="n">extraSearchPaths</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This locks and unlocks three times in a row, which is not only slightly inefficient, it also means that another thread could interleave calls in between, and get completely inconsistent state.</p></div></div><br /><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/D13627#inline-71512">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kiconloader.cpp:1829</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 style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">mIconAvailability</span><span class="p">.</span><span class="n">constFind</span><span class="p">(</span><span class="n">name</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span style="color: #aa4000">const</span> <span style="color: #aa4000">auto</span> <span class="n">end</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">mIconAvailability</span><span class="p">.</span><span class="n">constEnd</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">it</span> <span style="color: #aa2211">!=</span> <span class="n">end</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="n">it</span><span class="p">.</span><span class="n">value</span><span class="p">()</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span style="color: #aa2211">-></span><span class="n">shouldCheckForUnknownIcons</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">mIconAvailability</span><span class="p">.</span><span class="n">constFind</span><span class="p">(</span><span class="n">name</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">const</span> <span style="color: #aa4000">auto</span> <span class="n">end</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">mIconAvailability</span><span class="p">.</span><span class="n">constEnd</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">it</span> <span style="color: #aa2211">!=</span> <span class="n">end</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="n">it</span><span class="p">.</span><span class="n">value</span><span class="p">()</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">S_D</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">d</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span style="color: #aa2211">-></span><span class="n">shouldCheckForUnknownIcons</span><span class="p">())</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">similar here, if another thread changes mIconAvailability between the previous line and this one, you'll end up comparing iterators for a different container, that will never work</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R302 KIconThemes</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D13627">https://phabricator.kde.org/D13627</a></div></div><br /><div><strong>To: </strong>anthonyfieroni, davidedmundson, dfaure, Frameworks<br /><strong>Cc: </strong>kde-frameworks-devel, michaelh, ngraham, bruns<br /></div>