Fix message::to_string().

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index ed8039e2c0ea5d3d3a392ab12ce067cd5c46f15a..aa964bb7d87e183496b70b9ba790d259471fb088 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -234,6 +234,7 @@ int main(int argc, char* argv[])
         MSG_create_environment(opt::platform_file.c_str());
         XBT_DEBUG("Creating hostdata...");
         hostdata::create();
         MSG_create_environment(opt::platform_file.c_str());
         XBT_DEBUG("Creating hostdata...");
         hostdata::create();

+        XBT_INFO("Loaded description of %zd hosts.", hostdata::size());

         XBT_DEBUG("Deploying processes...");
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)
         XBT_DEBUG("Deploying processes...");
         if (opt::auto_depl::enabled) {
             if (!opt::auto_depl::nhosts)


@@ -243,8 +244,12 @@ int main(int argc, char* argv[])
                          opt::auto_depl::nhosts, hostdata::size());
                 opt::auto_depl::nhosts = hostdata::size();
             }
                          opt::auto_depl::nhosts, hostdata::size());
                 opt::auto_depl::nhosts = hostdata::size();
             }

-            if (!opt::auto_depl::load)
+            if (opt::auto_depl::load == 0.0) {
+                XBT_WARN("Initial load is zero!  Falling back on old behaviour.");

                 opt::auto_depl::load = opt::auto_depl::nhosts;
                 opt::auto_depl::load = opt::auto_depl::nhosts;

+            } else if (opt::auto_depl::load < 0.0)
+                opt::auto_depl::load =
+                    -opt::auto_depl::load * opt::auto_depl::nhosts;

             MY_launch_application(); // it is already opt::* aware...
         } else {
             MSG_launch_application(opt::deployment_file.c_str());
             MY_launch_application(); // it is already opt::* aware...
         } else {
             MSG_launch_application(opt::deployment_file.c_str());