<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="http://git.reviewboard.kde.org/r/105917/">http://git.reviewboard.kde.org/r/105917/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On January 9th, 2013, 10:38 p.m., <b>Milian Wolff</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="http://git.reviewboard.kde.org/r/105917/diff/5/?file=87030#file87030line914" style="color: black; font-weight: bold; text-decoration: underline;">shell/sessioncontroller.cpp</a>
<span style="font-weight: normal;">
(Diff revision 5)
</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; ">QList< SessionInfo > SessionController::availableSessionInfo()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">820</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">ret</span><span class="p">.</span><span class="n">success</span> <span class="o">=</span> <span class="kc">true</span><span class="p">;</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">899</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">// do not set lockedDBus to false: ret.success will be then set to</span></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;">this is wrong, no?
just encountered this code while refactoring it.
- we only reach this code path if we want to lock the session
- if we fail to "force remove" the lock file and cannot acquire the lockfile afterwards, something bad happened
I'll turn this into an assertion, i.e.: ensure that after attempRelock the lockfile was properly acquired</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;">The actual wrong is in my next commit, 61fd1270da44aebb1a4fe1a1ce4a4292b99e5545... Without it, the overall status of locking (LockSessionState::operator bool()) is determined by both lock-file status (LockSessionState::lockResult) and D-Bus status (LockSessionState::success), which is exactly what is needed.
Please, take a look at my github's master (git://github.com/intelfx/kdevplatform.git), revision 339e1c0 - I attempted to fix it once again :P
And about the assertion: IMO it isn't a right thing. If this happens, it means that we're encountering a problem in external environment (file system, permissions, or a user who decided to take a look at the lock-file and opened it in vim, etc.) and not an internal logic failure. Thus no sense in crashing application (and doing nothing in Release, btw)...
What do you think?</pre>
<br />
<p>- Ivan</p>
<br />
<p>On September 25th, 2012, 10:19 a.m., Ivan Shapovalov wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for KDevelop.</div>
<div>By Ivan Shapovalov.</div>
<p style="color: grey;"><i>Updated Sept. 25, 2012, 10:19 a.m.</i></p>
<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;">1: Use D-Bus instead of lock-files to lock kdevplatform sessions.
2: Moved the lockfile remove dialog which currently resides in KDevelop's main() - and which is usable only when the session name is explicitly given to the application - to kdevplatform's SessionController, adjusting the dialog for "lockfile -> dbus" changes.
This allows to get rid of nasty non-informative error messages about a session being already used and replace them with code that does the following things:
1) Attempts a DBus call to make a running instance visible;
2) If it didn't succeed, shows a dialog window asking permission to retry, show session chooser dialog or quit;
3) Repeats the entire procedure if a newly-picked session is locked too.
This code is also used when one picks a session from "Sessions" menu, so a nasty error message has also been removed also from there.
Related change to KDevelop is here: https://git.reviewboard.kde.org/r/105918/ .</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;">Existing unit-tests + manual UI testing.</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>shell/core.cpp <span style="color: grey">(206d48d)</span></li>
<li>shell/sessioncontroller.h <span style="color: grey">(551894d)</span></li>
<li>shell/sessioncontroller.cpp <span style="color: grey">(c9fac67)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/105917/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>