<table><tr><td style="">flherne requested changes to this revision.<br />flherne 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/D9016" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>This is definitely nicer; I remember being a bit puzzled by Helper being a class, and the inscrutable static-var problems are a nuisance.</p>
<p>There are some pre-existing thread-safety issues that should probably be fixed here.</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/D9016#inline-40441" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:80</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(151, 234, 151, .6);"><span class="n">QStringList</span><span style="color: #aa2211">&</span> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">dataDirs</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">static</span> <span class="n">QStringList</span> <span class="n">value</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Is this necessary? The variable is only used in <tt style="background: #ebebeb; font-size: 13px;">getDataDirs()</tt>. Some of the others are similar.</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/D9016#inline-40445" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:105</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(151, 234, 151, .6);"><span class="n">QMutex</span><span style="color: #aa2211">&</span> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">cacheMutex</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">static</span> <span class="n">QMutex</span> <span class="n">value</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Can these be next to the variable-containing-function they protect?</p>
<p style="padding: 0; margin: 8px;">Does it make sense for this to protect both <tt style="background: #ebebeb; font-size: 13px;">cachedSearchPaths()</tt> and <tt style="background: #ebebeb; font-size: 13px;">cachedCustomIncludes()</tt>? They don't seem particularly related.</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/D9016#inline-40440" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:325</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">if</span> <span class="p">(</span> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">dataDirs</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">dataDirs</span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">locateAll</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">,</span> <span style="color: #766510">"kdevpythonsupport/documentation_files"</span><span class="p">,</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">LocateDirectory</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">Helper</span><span style="color: #aa2211">::</span><span class="n">dataDirs<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span>.</span><span class="n">isEmpty</span><span class="p">()</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 class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">dataDirs<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">locateAll</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">,</span> <span style="color: #766510">"kdevpythonsupport/documentation_files"</span><span class="p">,</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">LocateDirectory</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This doesn't look thread-safe (in either the old or modified version); nothing locks the value while it's being written to.</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/D9016#inline-40442" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:334</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; "> <span style="color: #aa4000">auto</span> <span class="n">path</span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">locate</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">,</span> <span style="color: #766510">"kdevpythonsupport/documentation_files/builtindocumentation.py"</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">documentationFile</span> <span style="color: #aa2211">=</span> <span class="n">IndexedString</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">documentationFile<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span> <span style="color: #aa2211">=</span> <span class="n">IndexedString</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">ditto</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/D9016#inline-40443" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:348</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; "> <span class="n">ReferencedTopDUContext</span> <span class="n">ctx</span> <span style="color: #aa2211">=</span> <span class="n">ReferencedTopDUContext</span><span class="p">(</span><span class="n">DUChain</span><span style="color: #aa2211">::</span><span class="n">self</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">chainForDocument</span><span class="p">(</span><span class="n">file</span><span class="p">));</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">documentationFileContext</span> <span style="color: #aa2211">=</span> <span class="n">DUChainPointer</span><span style="color: #aa2211"><</span><span class="n">TopDUContext</span><span style="color: #aa2211">></span><span class="p">(</span><span class="n">ctx</span><span class="p">.</span><span class="n">data</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">documentationFileContext<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span> <span style="color: #aa2211">=</span> <span class="n">DUChainPointer</span><span style="color: #aa2211"><</span><span class="n">TopDUContext</span><span style="color: #aa2211">></span><span class="p">(</span><span class="n">ctx</span><span class="p">.</span><span class="n">data</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">return</span> <span class="n">ctx</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">ditto</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/D9016#inline-40444" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:391</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">if</span> <span class="p">(</span> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">correctionFileDirs</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">()</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">correctionFileDirs</span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">locateAll</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</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">Helper</span><span style="color: #aa2211">::</span><span class="n">correctionFileDirs<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span>.</span><span class="n">isEmpty</span><span class="p">()</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 class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">correctionFileDirs<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">locateAll</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">,</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #766510">"kdevpythonsupport/correction_files/"</span><span class="p">,</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">ditto</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/D9016#inline-40446" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">helpers.cpp:416</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">if</span> <span class="p">(</span> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">localCorrectionFileDir</span><span class="p">.</span><span class="n">isNull</span><span class="p">()</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">localCorrectionFileDir</span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">writableLocation</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">)</span> <span style="color: #aa2211">+</span> <span class="n">QLatin1Char</span><span class="p">(</span><span style="color: #766510">'/'</span><span class="p">)</span> <span style="color: #aa2211">+</span> <span style="color: #766510">"kdevpythonsupport/correction_files/"</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">Helper</span><span style="color: #aa2211">::</span><span class="n">localCorrectionFileDir<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span>.</span><span class="n">isNull</span><span class="p">()</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 class="n">Helper</span><span style="color: #aa2211">::</span><span class="n">localCorrectionFileDir<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span> <span style="color: #aa2211">=</span> <span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">writableLocation</span><span class="p">(</span><span class="n">QStandardPaths</span><span style="color: #aa2211">::</span><span class="n">GenericDataLocation</span><span class="p">)</span> <span style="color: #aa2211">+</span> <span class="n">QLatin1Char</span><span class="p">(</span><span style="color: #766510">'/'</span><span class="p">)</span> <span style="color: #aa2211">+</span> <span style="color: #766510">"kdevpythonsupport/correction_files/"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">ditto...</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R53 KDevelop: Python Support</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D9016" rel="noreferrer">https://phabricator.kde.org/D9016</a></div></div><br /><div><strong>To: </strong>brauch, flherne<br /><strong>Cc: </strong>kdevelop-devel<br /></div>