Merging upstream version 1.7.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
8bc0325467
commit
f6869e4fd3
20 changed files with 841 additions and 444 deletions
|
@ -1,6 +1,6 @@
|
|||
/* Plzip - Parallel compressor compatible with lzip
|
||||
Copyright (C) 2009 Laszlo Ersek.
|
||||
Copyright (C) 2009-2017 Antonio Diaz Diaz.
|
||||
Copyright (C) 2009-2018 Antonio Diaz Diaz.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
@ -229,6 +229,7 @@ extern "C" void * dworker_o( void * arg )
|
|||
if( rd == 0 ) break;
|
||||
}
|
||||
}
|
||||
show_progress( file_index.mblock( i ).size() );
|
||||
}
|
||||
|
||||
delete[] ibuffer; delete[] new_data;
|
||||
|
@ -298,17 +299,22 @@ int dec_stdout( const int num_workers, const int infd, const int outfd,
|
|||
delete[] worker_threads;
|
||||
delete[] worker_args;
|
||||
|
||||
const unsigned long long in_size = file_index.cdata_size();
|
||||
const unsigned long long out_size = file_index.udata_size();
|
||||
if( verbosity >= 2 && out_size > 0 && in_size > 0 )
|
||||
std::fprintf( stderr, "%6.3f:1, %6.3f bits/byte, %5.2f%% saved. ",
|
||||
(double)out_size / in_size,
|
||||
( 8.0 * in_size ) / out_size,
|
||||
100.0 * ( 1.0 - ( (double)in_size / out_size ) ) );
|
||||
if( verbosity >= 4 )
|
||||
std::fprintf( stderr, "decompressed %9llu, compressed %9llu. ",
|
||||
out_size, in_size );
|
||||
|
||||
if( verbosity >= 2 )
|
||||
{
|
||||
if( verbosity >= 4 ) show_header( file_index.dictionary_size( 0 ) );
|
||||
const unsigned long long in_size = file_index.cdata_size();
|
||||
const unsigned long long out_size = file_index.udata_size();
|
||||
if( out_size == 0 || in_size == 0 )
|
||||
std::fputs( "no data compressed. ", stderr );
|
||||
else
|
||||
std::fprintf( stderr, "%6.3f:1, %5.2f%% ratio, %5.2f%% saved. ",
|
||||
(double)out_size / in_size,
|
||||
( 100.0 * in_size ) / out_size,
|
||||
100.0 - ( ( 100.0 * in_size ) / out_size ) );
|
||||
if( verbosity >= 3 )
|
||||
std::fprintf( stderr, "decompressed %9llu, compressed %8llu. ",
|
||||
out_size, in_size );
|
||||
}
|
||||
if( verbosity >= 1 ) std::fputs( "done\n", stderr );
|
||||
|
||||
if( debug_level & 1 )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue