ag_parameters: double deadline

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 8a1d5c8408f74812a78f0e079eb913bfe33b13a4..89e9becf3bd4c33f6d0081729c95ec368240cbab 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,7 @@
 #include <cstring>              // strchr
 #include <iostream>
 #include <stdexcept>
 #include <cstring>              // strchr
 #include <iostream>
 #include <stdexcept>

+#include <unistd.h>

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


@@ -149,6 +150,15 @@ static bool check_for_lost_load()
     return res;
 }
 
     return res;
 }
 

+static void check_file_access(const std::string& name)
+{
+    if (access(name.c_str(), R_OK) != 0) {
+        std::cerr << "ERROR: cannot access to file \""
+                  << name << "\" for reading: " << strerror(errno) << "\n";
+        exit(EXIT_FAILURE_ARGS);
+    }
+}
+

 static void signal_handler(int /*sig*/)
 {
     if (!opt::exit_request) {
 static void signal_handler(int /*sig*/)
 {
     if (!opt::exit_request) {


@@ -171,7 +181,7 @@ static void install_signal_handler()
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_RESTART;
     if (sigaction(SIGINT, &action, NULL) == -1) {
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_RESTART;
     if (sigaction(SIGINT, &action, NULL) == -1) {

-        std::cerr << "sigaction: " << strerror(errno) << "\n";
+        std::cerr << "ERROR: sigaction: " << strerror(errno) << "\n";

         exit(EXIT_FAILURE_OTHER);
     }
 }
         exit(EXIT_FAILURE_OTHER);
     }
 }


@@ -236,6 +246,7 @@ int main(int argc, char* argv[])
 
     // Create the platform and the application.
     XBT_DEBUG("Loading platform file...");
 
     // Create the platform and the application.
     XBT_DEBUG("Loading platform file...");

+    check_file_access(opt::platform_file);

     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();


@@ -264,6 +275,7 @@ int main(int argc, char* argv[])
         }
         MY_launch_application(); // it is already opt::* aware...
     } else {
         }
         MY_launch_application(); // it is already opt::* aware...
     } else {

+        check_file_access(opt::deployment_file);

         MSG_launch_application(opt::deployment_file.c_str());
     }
 
         MSG_launch_application(opt::deployment_file.c_str());
     }
 


@@ -274,6 +286,7 @@ int main(int argc, char* argv[])
 
     proc_mutex = new mutex_t();
     proc_cond = new condition_t();
 
     proc_mutex = new mutex_t();
     proc_cond = new condition_t();

+    process::set_proc_mutex(proc_mutex);

 
     // Launch the MSG simulation.
     XBT_INFO("Starting simulation at %f...", MSG_get_clock());
 
     // Launch the MSG simulation.
     XBT_INFO("Starting simulation at %f...", MSG_get_clock());


@@ -281,6 +294,7 @@ int main(int argc, char* argv[])
     simulated_time = MSG_get_clock();
     XBT_INFO("Simulation ended at %f.", simulated_time);
 
     simulated_time = MSG_get_clock();
     XBT_INFO("Simulation ended at %f.", simulated_time);
 

+    process::set_proc_mutex(NULL);

     delete proc_cond;
     delete proc_mutex;
 
     delete proc_cond;
     delete proc_mutex;