<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/118586/">https://git.reviewboard.kde.org/r/118586/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On June 6th, 2014, 8:48 a.m. UTC, <b>David Faure</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/118586/diff/1/?file=279281#file279281line337" style="color: black; font-weight: bold; text-decoration: underline;">kdecore/config/kconfig.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">QStringList KConfigPrivate::groupList(const QByteArray& group) const</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">329</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">groups</span> <span class="o"><<</span> <span class="n">parentGroup</span><span class="p">;</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">isn't this removal going to affect all callers of allSubGroups, possibly creating bugs?
hasNonDeletedEntries doesn't call allSubGroups anymore, but deleteGroupImpl does. Are you sure that it's unaffected by this change?</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Well, sure - it could fail. But that's what the unit tests are there for, no?
The isGroupOrSubGroupMatch also takes the parentGroup into account. So I don't have to add it upfront, it will be added later on. If I mess with that function to exclude the parent group, the unit tests start to fail:
FAIL! : KConfigTest::testDelete() '!delgr.exists()' returned FALSE. ()
Loc: [/ssd/milian/projects/kde4/kdelibs/kdecore/tests/kconfigtest.cpp(702)]
FAIL! : KConfigTest::testDeleteWhenLocalized() '!cg.hasKey("foo")' returned FALSE. ()
Loc: [/ssd/milian/projects/kde4/kdelibs/kdecore/tests/kconfigtest.cpp(1497)]
FAIL! : KConfigTest::testDefaultGroup() 'lines.first() != QByteArray("TestKey=defaultGroup\n")' returned FALSE. ()
Loc: [/ssd/milian/projects/kde4/kdelibs/kdecore/tests/kconfigtest.cpp(797)]
FAIL! : KConfigTest::testEmptyGroup() '!emptyGroup.exists()' returned FALSE. ()
Loc: [/ssd/milian/projects/kde4/kdelibs/kdecore/tests/kconfigtest.cpp(805)]
so again, I'm pretty confident that this patch is fine.</pre>
<br />
<p>- Milian</p>
<br />
<p>On June 6th, 2014, 8:17 a.m. UTC, Milian Wolff wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for kdelibs and David Faure.</div>
<div>By Milian Wolff.</div>
<p style="color: grey;"><i>Updated June 6, 2014, 8:17 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdelibs
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Optimize KConfigGroup::exists and similar operations.
Before, these kind of read-only operations did a lot of allocations:
1) allocate a list of all sub groups
2) for the above, also allocate a sub-group match key
3) iterate over sub groups, allocate a list of all keys in there
and then finally check whether that list is non-empty
All of the above is now done without a single allocation, by simply
iterating over the list of entries.
Note: The whole list was iterated even before in allSubGroups. Now
we still do that, but check for non-empty keys in the group or
sub group directly. Much more efficient.
Note2: While at it, a duplicate comparison in keyListImpl is removed.
Furthermore, allSubGroups is also optimized to not require the
allocation of the subgroup match key.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The unit tests all run just fine. I broke it while implementing this patch, so I'm confident this functionality is actually properly tested and covered :)
The saved allocations are plenty. This is e.g. from the startup of kwrite:
2844 allocations at:
0x7ff7fbc490e9 QHashData::allocateNode(int) /usr/lib/libQtCore.so.4
0x7ff7fc152f8e QHash<QString, QHashDummyValue>::createNode(unsigned int, QString const&, QHashDummyValue const&, QHashNode<QString, QHashDumm
yValue>**) in /usr/include/qt4/QtCore/qhash.h:543 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc152472 QHash<QString, QHashDummyValue>::insert(QString const&, QHashDummyValue const&) in /usr/include/qt4/QtCore/qhash.h:763 /ssd/mi
lian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc1515f9 QSet<QString>::insert(QString const&) in /usr/include/qt4/QtCore/qset.h:181 /ssd/milian/projects/compiled/kde4/lib/libkdecore.
so.5
0x7ff7fc1501ab QSet<QString>::operator<<(QString const&) in /usr/include/qt4/QtCore/qset.h:201 /ssd/milian/projects/compiled/kde4/lib/libkdec
ore.so.5
0x7ff7fc14b4a7 KConfigPrivate::keyListImpl(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:367 /ssd/
milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc14b25d KConfigPrivate::hasNonDeletedEntries(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:
347 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc14dfeb KConfig::hasGroupImpl(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:856 /ssd/milian
/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc1536b4 KConfigBase::hasGroup(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfigbase.cpp:42 /ssd/mil
ian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc158fcd KConfigGroup::exists() const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfiggroup.cpp:592 /ssd/milian/projects/com
piled/kde4/lib/libkdecore.so.5
2844 allocations at:
0x7ff7fbc71426 QString::QString(int, Qt::Initialization) /usr/lib/libQtCore.so.4
0x7ff7fbd66820 ? /usr/lib/libQtCore.so.4
0x7ff7fbc737db QString::fromUtf8(char const*, int) /usr/lib/libQtCore.so.4
0x7ff7fc14b494 KConfigPrivate::keyListImpl(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:367 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc14b25d KConfigPrivate::hasNonDeletedEntries(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:347 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc14dfeb KConfig::hasGroupImpl(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfig.cpp:856 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc1536b4 KConfigBase::hasGroup(QByteArray const&) const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfigbase.cpp:42 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
0x7ff7fc158fcd KConfigGroup::exists() const in /ssd/milian/projects/kde4/kdelibs/kdecore/config/kconfiggroup.cpp:592 /ssd/milian/projects/compiled/kde4/lib/libkdecore.so.5
All of these are gone with the patch.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kdecore/config/kconfig.cpp <span style="color: grey">(790227ad7531acb8daa00f739267737247d9b7a0)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/118586/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>