Add source files for deployment.

diff --git a/Makefile b/Makefile
index 7cf5a65b4f38509eabef390e9f7245215b2e4472..f2d206cb76a4d126d819685e72da4fe378181a45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ SETLOCALVERSION := ./setlocalversion
 SRC.loba := main.cpp           \
        communicator.cpp        \
        cost_func.cpp           \
 SRC.loba := main.cpp           \
        communicator.cpp        \
        cost_func.cpp           \

+       deployment.cpp          \

        hostdata.cpp            \
        $(wildcard loba_*.cpp)  \
        misc.cpp                \
        hostdata.cpp            \
        $(wildcard loba_*.cpp)  \
        misc.cpp                \

diff --git a/deployment.cpp b/deployment.cpp
new file mode 100644 (file)
index 0000000..db02f0d
--- /dev/null
+++ b/deployment.cpp
@@ -0,0 +1,9 @@
+#include "deployment.h"
+
+namespace {
+
+}
+
+void MY_launch_application()
+{
+}

diff --git a/deployment.h b/deployment.h
new file mode 100644 (file)
index 0000000..4dde480
--- /dev/null
+++ b/deployment.h
@@ -0,0 +1,10 @@
+#ifndef DEPLOYMENT_H
+#define DEPLOYMENT_H
+
+void MY_launch_application();
+
+#endif // !DEPLOYMENT_H
+
+// Local variables:
+// mode: c++
+// End:

diff --git a/main.cpp b/main.cpp
index f171425222fa928cb2d9fcc7312183025b35a2f6..8c1965a1b257b2a22708f86d145786f5a925e72b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <stdexcept>
 #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"


@@ -90,14 +91,11 @@ int main(int argc, char* argv[])
         MSG_create_environment(opt::platform_file.c_str());
         hostdata::create();
         if (opt::auto_depl::enabled) {
         MSG_create_environment(opt::platform_file.c_str());
         hostdata::create();
         if (opt::auto_depl::enabled) {

-            opt::auto_depl::nhosts = hostdata::size();
-            opt::auto_depl::load = hostdata::size();
-            try {
-                // fixme: do auto deployment
-            }
-            catch (std::exception& e) {
-                THROW1(0, 0, "%s", e.what());
-            }
+            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());
         }
         } else {
             MSG_launch_application(opt::deployment_file.c_str());
         }