eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-17 05:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bogus speed reports after resuming tracked operation.

Browse Source 
When resuming reencryption operation (both LUKS2 and legacy offline
code) speeds were incorectly calculated from whole progress including
range already reencrypted in previous runs. Now we track speed only
for currently running session.
This commit is contained in:
Ondrej Kozina
2019-10-09 15:27:35 +02:00
parent 0c8cf5c1e0
commit f7fbf4d38c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils_tools.c
View File

@@ -380,7 +380,7 @@ void tools_clear_line(void)
log_std("\33[2K\r");
}
static void tools_time_progress(uint64_t device_size, uint64_t bytes,
static void tools_time_progress(uint64_t device_size, uint64_t bytes, uint64_t *start_bytes,
struct timeval *start_time, struct timeval *end_time)
{
struct timeval now_time;
@@ -396,6 +396,7 @@ static void tools_time_progress(uint64_t device_size, uint64_t bytes,
if (start_time->tv_sec == 0 && start_time->tv_usec == 0) {
*start_time = now_time;
*end_time = now_time;
*start_bytes = bytes;
return;
}
@@ -417,11 +418,11 @@ static void tools_time_progress(uint64_t device_size, uint64_t bytes,
return;
mbytes = bytes / 1024 / 1024;
mib = (double)(mbytes) / tdiff;
mib = (double)((bytes - *start_bytes) / 1024 / 1024) / tdiff;
if (!mib)
return;
/* FIXME: calculate this from last minute only and remaining space */
/* FIXME: calculate this from last minute only. */
eta = (unsigned long long)(device_size / 1024 / 1024 / mib - tdiff);
tools_clear_line();
@@ -443,9 +444,10 @@ static void tools_time_progress(uint64_t device_size, uint64_t bytes,
int tools_wipe_progress(uint64_t size, uint64_t offset, void *usrptr)
{
static struct timeval start_time = {}, end_time = {};
static uint64_t start_offset = 0;
int r = 0;
tools_time_progress(size, offset, &start_time, &end_time);
tools_time_progress(size, offset, &start_offset, &start_time, &end_time);
check_signal(&r);
if (r) {
@@ -607,9 +609,10 @@ int tools_is_stdin(const char *key_file)
int tools_reencrypt_progress(uint64_t size, uint64_t offset, void *usrptr)
{
static struct timeval start_time = {}, end_time = {};
static uint64_t start_offset = 0;
int r = 0;
tools_time_progress(size, offset, &start_time, &end_time);
tools_time_progress(size, offset, &start_offset, &start_time, &end_time);
check_signal(&r);
if (r) {