[Compbench-devel] CompBenchmarks++/compbenchmarks-plan cloptions.cpp, 1.10, 1.11

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

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

Modified Files:
	cloptions.cpp 
Log Message:
--run-number added.

Index: cloptions.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cloptions.cpp	10 Sep 2007 16:41:51 -0000	1.10
--- cloptions.cpp	10 Sep 2007 19:42:41 -0000	1.11
***************
*** 53,56 ****
--- 53,59 ----
  	    << "Plan management :" << std::endl
  	    << " --plan-register <file> [--default] : create file[.xml] plan." << std::endl
+ 	    << " --run-number <n>                   : among with --plan-register, " << std::endl
+ 	    << "                                      defines how many times each" << std::endl
+ 	    << "                                      benchmark'll be evaluated." << std::endl
  	    << " --output-directory <directory>     : defines the directory holding results" << std::endl
  	    << "                                      for new plan." << std::endl
***************
*** 233,236 ****
--- 236,240 ----
    std::string benchmarkName;
    std::string outputDirectoryName;
+   int         runNumber = 0;
    std::string archiveName;
  
***************
*** 253,256 ****
--- 257,261 ----
      {"plan-use", required_argument, 0, 1003},
      {"default", no_argument, 0, 1004},
+     {"run-number", required_argument, 0, 1005},
  
      {"batch-register", required_argument, 0, 2001},
***************
*** 328,331 ****
--- 333,339 ----
        }
        break;
+     case 1005:
+       runNumber=atoi(optarg);
+       break;
      case 2001:
        action=ActionRegisterBatch;
***************
*** 421,424 ****
--- 429,440 ----
      break;
    case ActionRegisterPlan:
+     if (runNumber<0) {
+       std::cerr << "Please specify a valid --run-number <n> (n must be >=1)." << std::endl;
+       break;
+     }
+     if (!runNumber) {
+       std::cerr << "--run-number <n> don't given. Each benchmark'll be evaluated 3 times" << std::endl;
+       runNumber=3;
+     }
      if (cbmSystem->fileExists(planFileName)) {
        std::cerr << "File " << planFileName << " exists." << std::endl
***************
*** 427,431 ****
      }
      P = new CBM::Plan;
! 
      if (outputDirectoryName=="") {
        std::cerr << "Please, specify an output directory name (see --output-directory)" << std::endl;
--- 443,447 ----
      }
      P = new CBM::Plan;
!     P->setRunNumber(runNumber);
      if (outputDirectoryName=="") {
        std::cerr << "Please, specify an output directory name (see --output-directory)" << std::endl;