Wip++...

* add process::receive
* whitespace cleanups

diff --git a/communicator.cpp b/communicator.cpp
index b78b1c3a97bdda6d6ddba7524b23d433d5c4bbe1..0d724aa171e11c3d1fe7793ece5d5210941fd670 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -50,7 +50,7 @@ void communicator::send(m_task_t task, const std::string& dest)
 }
 
 m_task_t communicator::recv()
 }
 
 m_task_t communicator::recv()

-{ 
+{

    m_task_t task = NULL;
    if (comm_test_n_destroy(recv_comm)) {
         task = recv_task;
    m_task_t task = NULL;
    if (comm_test_n_destroy(recv_comm)) {
         task = recv_task;

diff --git a/main.cpp b/main.cpp
index dbc5b4306b7c7f98d222354391f9aeba883dc919..314cac26c96ecc8c92de85a8755d9058af4e1f3f 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -37,8 +37,9 @@ int main(int argc, char *argv[])
 
     simulation_time.start();
 
 
     simulation_time.start();
 

-    // Set default logging threshold.
+    // Set default logging parameters

     // xbt_log_control_set("simu.thres:verbose");
     // xbt_log_control_set("simu.thres:verbose");

+        xbt_log_control_set("simu.fmt:'[%h %r] [%c/%p] %m%n'");

 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems
 
     // Initialize some MSG internal data.
     // Note: MSG_global_init() may throw an exception, but it seems


@@ -60,7 +61,7 @@ int main(int argc, char *argv[])
     }
     opt::print();
 
     }
     opt::print();
 

-    TRY {    
+    TRY {

         exit_status = EXIT_FAILURE_INIT; // =====
 
         // Register the main function of an agent in a global table.
         exit_status = EXIT_FAILURE_INIT; // =====
 
         // Register the main function of an agent in a global table.

diff --git a/options.cpp b/options.cpp
index aa3bedea4fe075bd018e69e0cfb8e3f6005a79b5..24ae952789781cba83c8517e0d3836d6cbf446fc 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -17,8 +17,8 @@ namespace opt {
     int help_requested = 0;
     bool version_requested = false;
 
     int help_requested = 0;
     bool version_requested = false;
 

-    cost_func comp_cost("1, 0");
-    cost_func comm_cost("1, 0");
+    cost_func comp_cost("1e9, 0"); // fixme: find better defaults
+    cost_func comm_cost("1e9, 0"); // fixme: find better defaults

 
 } // namespace opt
 
 
 } // namespace opt
 


@@ -68,7 +68,7 @@ int opt::parse_args(int* argc, char* argv[])
 
     return 1;
 }
 
     return 1;
 }

-    
+

 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");

diff --git a/process.cpp b/process.cpp
index 76058180c01d7a4e08cd008b07eaa043e0575fbf..d1576cef6f6330589d79edaec9d2e7a396045163 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -40,7 +40,13 @@ process::process(int argc, char *argv[])
 int process::run()
 {
     INFO0("Coucou !");
 int process::run()
 {
     INFO0("Coucou !");

-    MSG_process_sleep(100.0);   // xxx
+
+    int n = 100;
+    while (n--) {
+        compute();
+        receive();
+    }
+    //    MSG_process_sleep(100.0);   // xxx

     /* xxx:
      * while (there is something to do) {
      *    compute some task;
     /* xxx:
      * while (there is something to do) {
      *    compute some task;


@@ -61,10 +67,25 @@ int process::run()
     return 0;
 }
 
     return 0;
 }
 

+void process::receive()
+{
+    m_task_t task;
+    while ((task = comm.recv())) {
+        message *msg = (message *)MSG_task_get_data(task);
+        DEBUG3("Received load: %g, info: %g from %s",
+               msg->transfer, msg->measure,
+               MSG_host_get_name(MSG_task_get_source(task)));
+        load += msg->transfer;
+        // fixme: what is xxx ???
+        // neigh[xxx].setLoad(msg->measure);
+    }
+}
+

 void process::compute()
 {
     double duration = opt::comp_cost(load);
     m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
 void process::compute()
 {
     double duration = opt::comp_cost(load);
     m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);

+    DEBUG2("Compute %g flop%s.", duration, duration > 1 ? "s" : "");

     MSG_task_execute(task);
     MSG_task_destroy(task);
 }
     MSG_task_execute(task);
     MSG_task_destroy(task);
 }

diff --git a/process.h b/process.h
index 8711fca03a2d358d91af8e58f62f73b08e15f040..aa1e032122e18545ce45d3d20ef4735ada3583a0 100644 (file)
--- a/process.h
+++ b/process.h
@@ -17,6 +17,7 @@ private:
     std::vector<neighbor> neigh;
     double load;
 
     std::vector<neighbor> neigh;
     double load;
 

+    void receive();

     void compute();
     void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);
 };
     void compute();
     void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);
 };

diff --git a/simple_async.cpp b/simple_async.cpp
index b2d8bc0032b39c26803ce8ede76f3842cddb0c9b..2ad0cbc3146a101a24205c6454d9a24c2ad19b06 100644 (file)
--- a/simple_async.cpp
+++ b/simple_async.cpp
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     MSG_global_init(&argc, argv);
 
     exit_status = EXIT_FAILURE_ARGS; // =====
     MSG_global_init(&argc, argv);
 
     exit_status = EXIT_FAILURE_ARGS; // =====

-    TRY {    
+    TRY {

 
         // Parse global parameters
         if (argc != 3) {
 
         // Parse global parameters
         if (argc != 3) {

diff --git a/timer.h b/timer.h
index 6ae15eb94e3a6988fdb11534649be596c4656442..0e8c7d9866acb957aec7448479228cb804582064 100644 (file)
--- a/timer.h
+++ b/timer.h
@@ -66,12 +66,12 @@ public:
 
     void start()
     {
 
     void start()
     {

-        getrusage(RUSAGE_SELF, &before);        
+        getrusage(RUSAGE_SELF, &before);

     }
 
     void stop()
     {
     }
 
     void stop()
     {

-        getrusage(RUSAGE_SELF, &after);        
+        getrusage(RUSAGE_SELF, &after);

         difference = difference + ((after.ru_utime + after.ru_stime) -
                                    (before.ru_utime + before.ru_stime));
     }
         difference = difference + ((after.ru_utime + after.ru_stime) -
                                    (before.ru_utime + before.ru_stime));
     }