From 472f506817bb1af2fceb039ba148d15723944562 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 25 Feb 2016 13:47:30 -0600 Subject: Improve progress bar handling for backup / restore / image flash The progress bar will now be updated during image backups, restores and during image flashing (except for sparse images which will require significant changes to libsparse, and except for mtd nand using flash_utils). The progress bar will now be updated mid-file for file systems (tar) so the user will see changes even during large file backup / restore. Add a new progress tracking class to simplify handling of progress bar updates. The class will only update the progress bar 5 times a second to reduce the CPU load from updating the GUI frequently which does affect backup times. Change-Id: Iff382faef3df1f86604af336c1a8ce8993cd12c5 --- libtar/extract.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libtar') diff --git a/libtar/extract.c b/libtar/extract.c index 257e140d5..6a63ff738 100644 --- a/libtar/extract.c +++ b/libtar/extract.c @@ -32,6 +32,8 @@ # include "selinux/selinux.h" #endif +const unsigned long long progress_size = (unsigned long long)(T_BLOCKSIZE); + static int tar_set_file_perms(TAR *t, const char *realname) { @@ -245,6 +247,11 @@ tar_extract_regfile(TAR *t, const char *realname, const int *progress_fd) close(fdout); return -1; } + else + { + if (*progress_fd != 0) + write(*progress_fd, &progress_size, sizeof(progress_size)); + } } /* close output file */ @@ -255,12 +262,6 @@ tar_extract_regfile(TAR *t, const char *realname, const int *progress_fd) printf("### done extracting %s\n", filename); #endif - if (*progress_fd != 0) - { - unsigned long long file_size = (unsigned long long)(size); - write(*progress_fd, &file_size, sizeof(file_size)); - } - return 0; } -- cgit v1.2.3