Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match up OperationDetail creation and status setting for internal copy (#790842) 

This is not required, but it is more logical to have an OperationDetail
object created and it's final status set in the same function rather
than split between caller and callee.  So move creation of
"copy %1 using a block size of %2" OperationDetail objects into
GParted_Core::copy().

Also introduces a couple of variables to remove some recomputation:
benchmark_od & remaining_length.

Bug 790842 - Report libparted messages into operation details at the
             point at which they occur
This commit is contained in:
Mike Fleetwood 2017-12-08 18:55:24 +00:00 committed by Curtis Gedak
parent e5ccb3b8bc
commit ff0360eb4f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CopyBlocks.cc
View File

@ -150,11 +150,6 @@ bool CopyBlocks::copy()
if ( blocksize > length ) if ( blocksize > length )
blocksize = length; blocksize = length;
operationdetail.add_child( OperationDetail(
/*TO TRANSLATORS: looks like copy 16.00 MiB using a block size of 1.00 MiB */
String::ucompose( _("copy %1 using a block size of %2"),
Utils::format_size( length, 1 ),
Utils::format_size( blocksize, 1 ) ) ) );
operationdetail.run_progressbar( (double)total_done, (double)total_length, PROGRESSBAR_TEXT_COPY_BYTES ); operationdetail.run_progressbar( (double)total_done, (double)total_length, PROGRESSBAR_TEXT_COPY_BYTES );
done = length % blocksize; done = length % blocksize;

21
src/GParted_Core.cc
View File

@ -3223,12 +3223,19 @@ bool GParted_Core::copy_blocks( const Glib::ustring & src_device,
Glib::Timer timer ; Glib::Timer timer ;
double smallest_time = 1000000 ; double smallest_time = 1000000 ;
bool succes = true ; bool succes = true ;
OperationDetail & benchmark_od = operationdetail.get_last_child();
//Benchmark copy times using different block sizes to determine optimal size //Benchmark copy times using different block sizes to determine optimal size
while ( succes && while ( succes &&
llabs( done ) + N <= src_length && llabs( done ) + N <= src_length &&
benchmark_blocksize <= N ) benchmark_blocksize <= N )
{ {
benchmark_od.add_child( OperationDetail(
/*TO TRANSLATORS: looks like copy 16.00 MiB using a block size of 1.00 MiB */
String::ucompose( _("copy %1 using a block size of %2"),
Utils::format_size( N, 1 ),
Utils::format_size( benchmark_blocksize, 1 ) ) ) );
timer .reset() ; timer .reset() ;
succes = CopyBlocks( src_device, succes = CopyBlocks( src_device,
dst_device, dst_device,
@ -3236,15 +3243,15 @@ bool GParted_Core::copy_blocks( const Glib::ustring & src_device,
offset_write + (done / dst_sector_size), offset_write + (done / dst_sector_size),
N, N,
benchmark_blocksize, benchmark_blocksize,
operationdetail .get_last_child(), benchmark_od,
total_done, total_done,
src_length, src_length,
cancel_safe ).copy(); cancel_safe ).copy();
timer.stop() ; timer.stop() ;
operationdetail .get_last_child() .get_last_child() .add_child( OperationDetail( benchmark_od.get_last_child().add_child( OperationDetail(
String::ucompose( _("%1 seconds"), timer .elapsed() ), STATUS_NONE, FONT_ITALIC ) ) ; String::ucompose( _("%1 seconds"), timer .elapsed() ), STATUS_NONE, FONT_ITALIC ) ) ;
operationdetail.get_last_child().get_last_child().set_success_and_capture_errors( succes ); benchmark_od.get_last_child().set_success_and_capture_errors( succes );
if ( timer .elapsed() <= smallest_time ) if ( timer .elapsed() <= smallest_time )
{ {
@ -3268,11 +3275,17 @@ bool GParted_Core::copy_blocks( const Glib::ustring & src_device,
if ( succes && llabs( done ) < src_length ) if ( succes && llabs( done ) < src_length )
{ {
Byte_Value remaining_length = src_length - llabs( done );
operationdetail.add_child( OperationDetail(
/*TO TRANSLATORS: looks like copy 16.00 MiB using a block size of 1.00 MiB */
String::ucompose( _("copy %1 using a block size of %2"),
Utils::format_size( remaining_length, 1 ),
Utils::format_size( optimal_blocksize, 1 ) ) ) );
succes = CopyBlocks( src_device, succes = CopyBlocks( src_device,
dst_device, dst_device,
src_start + ((done > 0 ? done : 0) / src_sector_size), src_start + ((done > 0 ? done : 0) / src_sector_size),
dst_start + ((done > 0 ? done : 0) / dst_sector_size), dst_start + ((done > 0 ? done : 0) / dst_sector_size),
src_length - llabs( done ), remaining_length,
optimal_blocksize, optimal_blocksize,
operationdetail, operationdetail,
total_done, total_done,