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

Fix individual drive throughput running after

Browse Source 
a wipe has finished.

This problem was not seen when wiping multiple drives
of the same size as they all ended at the same time.
Also not seen when wiping  a single drive, but if you
wiped multiple drives of different sizes where the
drive wipes ended at different times then you could
see the throughput being calculated as steadily dropping
for a drive that had completed it's wipe.

Also fixed overall throughput. When all wipes had completed
overall throughput showed the throughput of the last drive
that finished. It should show 0 B/s as all wiping had
ceased. In the log table you will see individual drive
throughput and overall throughput which is the sum of
all the drives throughputs.
This commit is contained in:
PartialVolume
2020-03-30 08:59:24 +01:00
parent 22b08d43c8
commit cbe959455a
2 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/gui.c
View File

@@ -2146,7 +2146,6 @@ void* nwipe_gui_status( void* ptr )
/* Throughput variables */
u64 nwipe_throughput;
u64 nwipe_throughput_stopped;
/* The number of active wipe processes. */
/* Set to 1 initially to start loop. */
@@ -2350,7 +2349,7 @@ void* nwipe_gui_status( void* ptr )
if( nwipe_gui_blank == 0 )
{
if( nwipe_active && terminate_signal != 1 )
if( terminate_signal != 1 )
{
nwipe_active = compute_stats( ptr ); // Returns number of active wipe threads
}
@@ -2517,14 +2516,10 @@ void* nwipe_gui_status( void* ptr )
if( nwipe_active && terminate_signal != 1 )
{
nwipe_gui_load();
nwipe_throughput = nwipe_misc_thread_data->throughput;
nwipe_throughput_stopped = nwipe_throughput;
}
else
{
nwipe_throughput = nwipe_throughput_stopped;
}
nwipe_throughput = nwipe_misc_thread_data->throughput;
if( nwipe_throughput >= INT64_C( 1000000000000 ) )
{
nwipe_throughput /= INT64_C( 1000000000000 );
@@ -2554,11 +2549,8 @@ void* nwipe_gui_status( void* ptr )
/* Print the combined throughput. */
mvwprintw( stats_window, NWIPE_GUI_STATS_THROUGHPUT_Y, NWIPE_GUI_STATS_THROUGHPUT_X, "Throughput:" );
if( nwipe_throughput > 0 )
{
mvwprintw(
stats_window, NWIPE_GUI_STATS_THROUGHPUT_Y, NWIPE_GUI_STATS_TAB, nwipe_format, nwipe_throughput );
}
mvwprintw(
stats_window, NWIPE_GUI_STATS_THROUGHPUT_Y, NWIPE_GUI_STATS_TAB, nwipe_format, nwipe_throughput );
/* Change the current time into a delta. */
nwipe_time_now -= nwipe_time_start;
@@ -2670,40 +2662,43 @@ int compute_stats( void* ptr )
{
/* Increment the child counter. */
nwipe_active += 1;
}
/* Even if the wipe has finished ALWAYS run the stats one last time so the final SUCCESS percentage value is
* correct. Maintain a rolling average of throughput. */
nwipe_update_speedring( &c[i]->speedring, c[i]->round_done, nwipe_time_now );
/* Even if the wipe has finished ALWAYS run the stats one last time so the final SUCCESS percentage value is
* correct. Maintain a rolling average of throughput. */
nwipe_update_speedring( &c[i]->speedring, c[i]->round_done, nwipe_time_now );
if( c[i]->speedring.timestotal > 0 && c[i]->wipe_status == 1 )
{
/* Update the current average throughput in bytes-per-second. */
c[i]->throughput = c[i]->speedring.bytestotal / c[i]->speedring.timestotal;
/* Update the estimated remaining runtime. */
/* Check that throughput is not zero (sometimes caused during a sync) */
if( c[i]->throughput == 0 )
if( c[i]->speedring.timestotal > 0 && c[i]->wipe_status == 1 )
{
c[i]->throughput = 1;
/* Update the current average throughput in bytes-per-second. */
c[i]->throughput = c[i]->speedring.bytestotal / c[i]->speedring.timestotal;
/* Update the estimated remaining runtime. */
/* Check that throughput is not zero (sometimes caused during a sync) */
if( c[i]->throughput == 0 )
{
c[i]->throughput = 1;
}
c[i]->eta = ( c[i]->round_size - c[i]->round_done ) / c[i]->throughput;
if( c[i]->eta > nwipe_misc_thread_data->maxeta )
{
nwipe_misc_thread_data->maxeta = c[i]->eta;
}
}
c[i]->eta = ( c[i]->round_size - c[i]->round_done ) / c[i]->throughput;
if( c[i]->eta > nwipe_misc_thread_data->maxeta )
{
nwipe_misc_thread_data->maxeta = c[i]->eta;
}
/* Calculate the average throughput */
c[i]->throughput = (double) c[i]->round_done / (double) difftime( nwipe_time_now, c[i]->start_time );
}
/* Calculate the average throughput */
c[i]->throughput = (double) c[i]->round_done / (double) difftime( nwipe_time_now, c[i]->start_time );
/* Update the percentage value. */
c[i]->round_percent = (double) c[i]->round_done / (double) c[i]->round_size * 100;
/* Accumulate combined throughput. */
nwipe_misc_thread_data->throughput += c[i]->throughput;
if( c[i]->wipe_status == 1 )
{
/* Accumulate combined throughput. */
nwipe_misc_thread_data->throughput += c[i]->throughput;
}
/* Accumulate the error count. */
nwipe_misc_thread_data->errors += c[i]->pass_errors;

6
src/nwipe.c
View File

@@ -627,7 +627,7 @@ void* signal_hand( void* ptr )
{
// Log current status. All values are automatically updated by the GUI
case SIGUSR1: {
case SIGUSR1:
compute_stats( ptr );
for( i = 0; i < nwipe_misc_thread_data->nwipe_selected; i++ )
@@ -697,12 +697,11 @@ void* signal_hand( void* ptr )
}
break;
}
case SIGHUP:
case SIGINT:
case SIGQUIT:
case SIGTERM: {
case SIGTERM:
/* Set termination flag for main() which will do housekeeping prior to exit */
terminate_signal = 1;
@@ -713,7 +712,6 @@ void* signal_hand( void* ptr )
return ( (void*) 0 );
break;
}
}
}