Wip++...

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index d51fee22843a3803d878815bae0cc8d6fb7ff924..4f9c52ca7e398388b14059568ac999499bee0764 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -1,11 +1,14 @@
-#include <cstring>
+#include "options.h"
+
+#include <cstring>              // strrchr
+#include <iomanip>

 #include <iostream>
 #include <iostream>

-#include <unistd.h>
+#include <sstream>
+#include <unistd.h>             // getopt

 #include <xbt/log.h>
 #include <xbt/log.h>

-#include "options.h"

 #include "misc.h"
 
 #include "misc.h"
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);

 
 namespace opt {
 
 
 namespace opt {
 


@@ -17,9 +20,15 @@ namespace opt {
     int help_requested = 0;
     bool version_requested = false;
 
     int help_requested = 0;
     bool version_requested = false;
 

+    unsigned log_rate = 1;
+
+    unsigned maxiter = 4;
+    bool exit_on_close = false;
+

     bool bookkeeping = false;
 
     cost_func comp_cost("1e9, 0"); // fixme: find better defaults
     bool bookkeeping = false;
 
     cost_func comp_cost("1e9, 0"); // fixme: find better defaults

+    cost_func comm_cost("1, 0"); // fixme: find better defaults

 
 } // namespace opt
 
 
 } // namespace opt
 


@@ -41,17 +50,29 @@ int opt::parse_args(int* argc, char* argv[])
 
     int c;
     opterr = 0;
 
     int c;
     opterr = 0;

-    while ((c = getopt(*argc, argv, "bc:hV")) != -1) {
+    while ((c = getopt(*argc, argv, "bc:C:ehi:l:V")) != -1) {

         switch (c) {
         case 'b':
             opt::bookkeeping = true;
             break;
         switch (c) {
         case 'b':
             opt::bookkeeping = true;
             break;

+        case 'e':
+            opt::exit_on_close = true;
+            break;

         case 'h':
             opt::help_requested++;
             break;
         case 'c':
             opt::comp_cost = cost_func(optarg);
             break;
         case 'h':
             opt::help_requested++;
             break;
         case 'c':
             opt::comp_cost = cost_func(optarg);
             break;

+        case 'C':
+            opt::comm_cost = cost_func(optarg);
+            break;
+        case 'i':
+            std::istringstream(optarg) >> opt::maxiter;
+            break;
+        case 'l':
+            std::istringstream(optarg) >> opt::log_rate;
+            break;

         case 'V':
             opt::version_requested = true;
             break;
         case 'V':
             opt::version_requested = true;
             break;


@@ -92,12 +113,15 @@ void opt::print()
     INFO0(",----[ Simulation parameters ]");
     INFO1("| platform_file.......: \"%s\"", opt::platform_file);
     INFO1("| application_file....: \"%s\"", opt::application_file);
     INFO0(",----[ Simulation parameters ]");
     INFO1("| platform_file.......: \"%s\"", opt::platform_file);
     INFO1("| application_file....: \"%s\"", opt::application_file);

+    INFO1("| log rate............: %u",     opt::log_rate);
+    INFO1("| maxiter.............: %u",     opt::maxiter);
+    INFO1("| exit on close.......: %s",     on_off(opt::exit_on_close));

     INFO1("| bookkeeping.........: %s",     on_off(opt::bookkeeping));
     INFO1("| comp. cost factors..: [%s]",   opt::comp_cost.to_string().c_str());
     INFO1("| bookkeeping.........: %s",     on_off(opt::bookkeeping));
     INFO1("| comp. cost factors..: [%s]",   opt::comp_cost.to_string().c_str());

+    INFO1("| comm. cost factors..: [%s]",   opt::comm_cost.to_string().c_str());

     INFO0("`----");
 }
 
     INFO0("`----");
 }
 

-#include <iomanip>

 void opt::usage()
 {
     const int indent1 = 6;
 void opt::usage()
 {
     const int indent1 = 6;


@@ -116,10 +140,21 @@ void opt::usage()
         return;
 
     std::clog << o("-V") << "print version and exit\n";
         return;
 
     std::clog << o("-V") << "print version and exit\n";

+

     std::clog << o("-b") << "activate bookkeeping\n";
     std::clog << oo("-c", "[fn,...]f0")
               << "polynomial factors for computation cost ("
               << opt::comp_cost.to_string() << ")\n";
     std::clog << o("-b") << "activate bookkeeping\n";
     std::clog << oo("-c", "[fn,...]f0")
               << "polynomial factors for computation cost ("
               << opt::comp_cost.to_string() << ")\n";

+    std::clog << oo("-C", "[fn,...]f0")
+              << "polynomial factors for communication cost ("
+              << opt::comm_cost.to_string() << ")\n";
+    std::clog << o("-e") << "exit on close reception\n";
+    std::clog << oo("-i", "value")
+              << "maximum number of iterations, 0 for infinity ("
+              << opt::maxiter << ")\n";
+    std::clog << oo("-l", "value")
+              << "print current load every \"value\" iterations, 0 to disable ("
+              << opt::log_rate << ")\n";

 
 #undef o
 #undef oo
 
 #undef o
 #undef oo