[Compbench-devel] CompBenchmarks++ compbenchmarks-config, 1.19, 1.20

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27472

Modified Files:
	compbenchmarks-config 
Log Message:
--resume added.
More detailled interface on benchmarking progress.

Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** compbenchmarks-config	27 Sep 2006 16:23:24 -0000	1.19
--- compbenchmarks-config	3 Oct 2006 15:44:48 -0000	1.20
***************
*** 554,561 ****
    my $title   = shift;
    my $percent = shift;
!   my $result = "";
!   my $x;
  
!   my $cmd = "echo 'EOF' | $CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.0' --gauge '$title' 6 60 $percent";
  
    system("$cmd");
--- 554,568 ----
    my $title   = shift;
    my $percent = shift;
!   my $h       = shift;
!   my $w       = shift;
  
!   my $result = "";
!   if (!defined($h)) {
!      $h=6;
!   }
!   if (!defined($w)) {
!      $w=60;
!   }
!   my $cmd = "echo 'EOF' | $CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.0' --gauge '$title' $h $w $percent";
  
    system("$cmd");
***************
*** 834,840 ****
  
    if (!defined($resume)) {
!     cbmc_dialog_gauge("Benchmarking...", 0);
    } else {
!     cbmc_dialog_gauge("Resuming benchmarking...", 0);
    }
    foreach $r_l (keys %languages) {
--- 841,847 ----
  
    if (!defined($resume)) {
!     cbmc_dialog_gauge("Benchmarking...", 0, 10, 70);
    } else {
!     cbmc_dialog_gauge("Resuming benchmarking...", 0, 10, 70);
    }
    foreach $r_l (keys %languages) {
***************
*** 862,866 ****
  		    my $togo = ($TOTAL_TIME/$i)*($tot-$i);
  		    my $eta = cbmc_eta($togo);
! 		    cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)", sprintf("%d", $i*100.0/$tot));
  		  }
  		  
--- 869,873 ----
  		    my $togo = ($TOTAL_TIME/$i)*($tot-$i);
  		    my $eta = cbmc_eta($togo);
! 		    cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)\nCompiler : $r_c\nOptions : $r_o\nBenchmark : $r_b (" . ($r_n+1) . "/$CBM_BENCHMARKS_RUNS)", sprintf("%d", $i*100.0/$tot), 11, 70);
  		  }
  		  
***************
*** 877,881 ****
  		my $eta = cbmc_eta($togo);
  		$r=~s/ //g;
! 		cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)", sprintf("%d", $i*100.0/$tot));
  		my $F = $CBM_CURRENT_BENCH_RESULTS_FILE;
  		open(FD, ">>$F"); # file must exists for archiving
--- 884,888 ----
  		my $eta = cbmc_eta($togo);
  		$r=~s/ //g;
! 		cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)\nCompiler : $r_c\nOptions : $r_o\nBenchmark : $r_b (" . ($r_n+1) . "/$CBM_BENCHMARKS_RUNS)", sprintf("%d", $i*100.0/$tot), 11, 70);
  		my $F = $CBM_CURRENT_BENCH_RESULTS_FILE;
  		open(FD, ">>$F"); # file must exists for archiving
***************
*** 1065,1068 ****
--- 1072,1078 ----
    } elsif ($ARGV[0] eq '--setup') {
      cbmc_setup();
+   } elsif ($ARGV[0] eq '--resume') {
+     cbmc_setup();
+     cbmc_dialog_benchmark_run('resume');   
    } else {
      print STDERR "Unknown option.\n";
***************
*** 1105,1108 ****
--- 1115,1120 ----
  compbenchmarks-config --setup
  
+ compbenchmarks-config --resume
+ 
  =head1 DESCRIPTION
  
***************
*** 1117,1120 ****
--- 1129,1135 ----
  missing ones, basically according to your environment.
  
+ If --resume if the first argument, previous benchmarking is restored without any
+ user confirmation.
+ 
  compbenchmarks-config uses compbenchmark program.