[Sipp-commits] SF.net SVN: sipp:[535] sipp/trunk/sipp.cpp

[<cha...@us...>]

Revision: 535
          http://sipp.svn.sourceforge.net/sipp/?rev=535&view=rev
Author:   charlespwright
Date:     2008-09-22 15:12:06 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
Enh: Allow log files to be used in scenario initialization. (From Andy Aicken).

Modified Paths:
--------------
    sipp/trunk/sipp.cpp

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2008-09-22 14:48:05 UTC (rev 534)
+++ sipp/trunk/sipp.cpp	2008-09-22 15:12:06 UTC (rev 535)
@@ -30,6 +30,7 @@
  *           Wolfgang Beck
  *           Charles P Wright from IBM Research
  *           Martin Van Leeuwen
+ *           Andy Aicken
  */
 
 #define GLOBALS_FULL_DEFINITION
@@ -4407,9 +4408,12 @@
 	  REQUIRE_ARG();
 	  CHECK_PASS();
 	  if (!strcmp(argv[argi - 1], "-sf")) {
-	    main_scenario = new scenario(argv[argi], 0);
 	    scenario_file = new char [strlen(argv[argi])+1] ;
 	    sprintf(scenario_file,"%s", argv[argi]);
+	    if (useLogf == 1) {
+	      rotate_logfile();
+	    }
+	    main_scenario = new scenario(argv[argi], 0);
 	    main_scenario->stats->setFileName(argv[argi], (char*)".csv");
 	  } else if (!strcmp(argv[argi - 1], "-sn")) {
 	    int i = find_scenario(argv[argi]);
@@ -4677,10 +4681,6 @@
     print_count_file(countf, 1);
   }
 
-  if (useLogf == 1) {
-    rotate_logfile();
-  }
-
   if (dumpInRtt == 1) {
      main_scenario->stats->initRtt((char*)scenario_file, (char*)".csv",
                                 report_freq_dumpRtt);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.