Add source files for deployment.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index a4e9fdb054c8e476d6f277b77689e6348c68eacb..8c1965a1b257b2a22708f86d145786f5a925e72b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,9 @@
 #include <cstring>
 #include <iostream>
 #include <cstring>
 #include <iostream>

+#include <stdexcept>

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

+#include "deployment.h"

 #include "hostdata.h"
 #include "misc.h"
 #include "options.h"
 #include "hostdata.h"
 #include "misc.h"
 #include "options.h"


@@ -31,9 +33,15 @@ enum {
 int simulation_main(int argc, char* argv[])
 {
     int result;
 int simulation_main(int argc, char* argv[])
 {
     int result;

-    process* proc = new loba_least_loaded(argc, argv);
-    result = proc->run();
-    delete proc;
+    process* proc;
+    try {
+        proc = new loba_least_loaded(argc, argv);
+        result = proc->run();
+        delete proc;
+    }
+    catch (std::invalid_argument& e) {
+        THROW1(arg_error, 0, "%s", e.what());
+    }

     return result;
 }
 
     return result;
 }
 


@@ -62,7 +70,8 @@ int main(int argc, char* argv[])
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)

-            std::clog << version::name << " version " << version::num << "\n"
+            std::clog << version::name << " (" << opt::program_name << ")"
+                      << " version " << version::num << "\n"

                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)
                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)


@@ -77,13 +86,19 @@ int main(int argc, char* argv[])
 
         // Register the main function of an agent in a global table.
         MSG_function_register("simulation_main", simulation_main);
 
         // Register the main function of an agent in a global table.
         MSG_function_register("simulation_main", simulation_main);

-        // Preserve some compatibility with old code...
-        MSG_function_register("Calculs", simulation_main);

 
         // Create the platform and the application.
 
         // Create the platform and the application.

-        MSG_create_environment(opt::platform_file);
+        MSG_create_environment(opt::platform_file.c_str());

         hostdata::create();
         hostdata::create();

-        MSG_launch_application(opt::application_file);
+        if (opt::auto_depl::enabled) {
+            if (!opt::auto_depl::nhosts)
+                opt::auto_depl::nhosts = hostdata::size();
+            if (!opt::auto_depl::load)
+                opt::auto_depl::load = hostdata::size();
+            MY_launch_application(); // it is already opt::* aware...
+        } else {
+            MSG_launch_application(opt::deployment_file.c_str());
+        }

 
         exit_status = EXIT_FAILURE_SIMU; // =====
 
 
         exit_status = EXIT_FAILURE_SIMU; // =====