From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 14 Dec 2010 23:00:30 +0000 (+0100)
Subject: Add source files for deployment.
X-Git-Tag: v0.1~242
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/9c6f9565824d2cc3389e87f13ee9a0308d615807?ds=sidebyside;hp=d43e446400ac7b65d7d2dd3acd57f8f669484449

Add source files for deployment.
---

diff --git a/Makefile b/Makefile
index 7cf5a65..f2d206c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ SETLOCALVERSION := ./setlocalversion
 SRC.loba := main.cpp		\
 	communicator.cpp	\
 	cost_func.cpp		\
+	deployment.cpp		\
 	hostdata.cpp		\
 	$(wildcard loba_*.cpp)	\
 	misc.cpp		\
diff --git a/deployment.cpp b/deployment.cpp
new file mode 100644
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
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 f171425..8c1965a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
+#include "deployment.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) {
-            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());
         }