Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 05:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the premature exit when sizing konsole

Browse Source 
If you are running nwipe within the KDE konsole
terminal and you resize the window by pulling on
the corners, occasionally nwipe will exit with the
error message:

"GUI.c,nwipe_gui_select(), loop runaway,
did you close the terminal without exiting nwipe?
Initiating shutdown now"

The loop runaway detection has been made less sensitive,
i.e 32 iterations per second of the GUI update can now
be completed before a loop runaway is detected. previously
it was 8. In practise when sizing the konsole window,
anywhere between 1 and 17 iterations will occur.
This commit is contained in:
PartialVolume
2023-06-30 23:40:23 +01:00
parent 21ef97e355
commit d7b1fdf2ce
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui.c
View File

@@ -913,7 +913,7 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
previous_iteration_timestamp = time( NULL );
/* Calculate Maximum allowed iterations per second */
expected_iterations = ( 1000 / GETCH_BLOCK_MS ) * 2;
expected_iterations = ( 1000 / GETCH_BLOCK_MS ) * 8;
do
{
@@ -936,13 +936,13 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
* differentiate from normal operation and a failure of the getch function to block for the specified period
* of timeout. So here we check the while loop hasn't exceeded the number of expected iterations per second
* ie. a timeout(250) block value of 250ms means we should not see any more than (1000/250) = 4 iterations.
* We double this to 8 to allow a little tolerance. Why is this necessary? It's been found that in KDE
* konsole and other terminals based on the QT terminal engine exiting the terminal without first existing
* nwipe results in nwipe remaining running but detached from any interface which causes getch to fail and
* its associated timeout. So the CPU or CPU core rises to 100%. Here we detect that failure and exit nwipe
* gracefully with the appropriate error. This does not affect use of tmux for attaching or detaching from a
* running nwipe session when sitting at the selection screen. All other terminals correctly terminate nwipe
* when the terminal itself is exited.
* We increase this to 32 iterations to allow a little tolerance. Why is this necessary? It's been found
* that in KDE konsole and other terminals based on the QT terminal engine exiting the terminal without
* first exiting nwipe results in nwipe remaining running but detached from any interface which causes
* getch to fail and its associated timeout. So the CPU or CPU core rises to 100%. Here we detect that
* failure and exit nwipe gracefully with the appropriate error. This does not affect use of tmux for
* attaching or detaching from a running nwipe session when sitting at the selection screen. All other
* terminals correctly terminate nwipe when the terminal itself is exited.
*/
iteration_counter++;
@@ -953,8 +953,8 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
{
nwipe_log( NWIPE_LOG_ERROR,
"GUI.c,nwipe_gui_select(), loop runaway, did you close the terminal without exiting "
"nwipe? Initiating shutdown now." );
/* Issue signal to nwipe to shutdown immediately but gracefully */
"nwipe? Exiting nwipe now." );
/* Issue signal to nwipe to exit immediately but gracefully */
terminate_signal = 1;
}
}

4
src/version.c
View File

@@ -4,7 +4,7 @@
* used by configure to dynamically assign those values
* to documentation files.
*/
const char* version_string = "0.34.86 Development code, not for production use!";
const char* version_string = "0.34.87 Development code, not for production use!";
const char* program_name = "nwipe";
const char* author_name = "Martijn van Brummelen";
const char* email_address = "git@brumit.nl";
@@ -14,4 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE.\n";
const char* banner = "nwipe 0.34.86 Development code, not for production use!";
const char* banner = "nwipe 0.34.87 Development code, not for production use!";