From 209c13a8a2e1f6fb7bcfa01127a201b015d0776b Mon Sep 17 00:00:00 2001 From: Phillip Lougher Date: Wed, 29 May 2013 03:51:49 +0100 Subject: unsquashfs: quieten progressbar Remove the update of the progressbar every time an inode is written. On a slow link/terminal this can mean unsquashfs bottlenecks on progressbar output. Signed-off-by: Phillip Lougher --- squashfs-tools/unsquashfs.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c index df9e9cd..b7601e8 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c @@ -120,7 +120,6 @@ struct test table[] = { }; void progress_bar(long long current, long long max, int columns); -void update_progress_bar(); #define MAX_LINE 16384 @@ -1561,10 +1560,8 @@ void dir_scan(char *parent_name, unsigned int start_block, unsigned int offset, if(lsonly || info) print_filename(pathname, i); - if(!lsonly) { + if(!lsonly) create_inode(pathname, i); - update_progress_bar(); - } if(i->type == SQUASHFS_SYMLINK_TYPE || i->type == SQUASHFS_LSYMLINK_TYPE) @@ -2268,14 +2265,6 @@ void disable_progress_bar() } -void update_progress_bar() -{ - pthread_mutex_lock(&screen_mutex); - pthread_cond_signal(&progress_wait); - pthread_mutex_unlock(&screen_mutex); -} - - void progressbar_error(char *fmt, ...) { va_list ap; @@ -2392,7 +2381,7 @@ int parse_number(char *arg, int *res) #define VERSION() \ - printf("unsquashfs version 4.2-git (2013/04/16)\n");\ + printf("unsquashfs version 4.2-git (2013/05/28)\n");\ printf("copyright (C) 2013 Phillip Lougher "\ "\n\n");\ printf("This program is free software; you can redistribute it and/or"\ -- cgit v1.2.3