Do load_balance_loop in the new spawned thread instead of compute_loop.

diff --git a/deployment.cpp b/deployment.cpp
index fa9e73105897ebe2262c9f0c64eca66d0619e466..70bd8b3f15bf4c670703b04509d25f6e307eef8b 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -59,7 +59,7 @@ void deployment_generator::deploy()
             XBT_DEBUG("%s/neighbor -> \"%s\"", hostname, neighbor_name);
             xbt_dynar_push_as(args, const char*, neighbor_name);
         }
             XBT_DEBUG("%s/neighbor -> \"%s\"", hostname, neighbor_name);
             xbt_dynar_push_as(args, const char*, neighbor_name);
         }

-        MSG_set_function(hostname, "loba", args);
+        MSG_set_function(hostname, "compute", args);

         xbt_dynar_reset(args);
     }
     xbt_dynar_free(&args);
         xbt_dynar_reset(args);
     }
     xbt_dynar_free(&args);

diff --git a/process.cpp b/process.cpp
index f997d99efc7c1127520e535e7e75e61ea1bd14d0..65496385f08f45baf7d4e1b8015c78e7f54cf0e4 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -58,9 +58,9 @@ process::process(int argc, char* argv[])
 
     comp_iter = lb_iter = 0;
 
 
     comp_iter = lb_iter = 0;
 

-    compute_thread = new_msg_thread("compute",
-                                    std::tr1::bind(&process::compute_loop,
-                                                   this));
+    lb_thread = new_msg_thread("loba",
+                               std::tr1::bind(&process::load_balance_loop,
+                                              this));

 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -80,7 +80,7 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
 
 process::~process()
 {

-    delete compute_thread;
+    delete lb_thread;

     total_load_exit += real_load;
     if (opt::log_rate < 0)
         return;
     total_load_exit += real_load;
     if (opt::log_rate < 0)
         return;


@@ -99,9 +99,9 @@ int process::run()
     if (opt::log_rate >= 0)
         XBT_INFO("Initial load: %g", real_load);
     XBT_VERB("Starting...");
     if (opt::log_rate >= 0)
         XBT_INFO("Initial load: %g", real_load);
     XBT_VERB("Starting...");

-    compute_thread->start();
-    load_balance_loop();
-    compute_thread->wait();
+    lb_thread->start();
+    compute_loop();
+    lb_thread->wait();

     XBT_VERB("Done.");
     return 0;
 }
     XBT_VERB("Done.");
     return 0;
 }

diff --git a/process.h b/process.h
index dbf9b05a34c53cee4e2f95c96f4ce72c0a49e781..ceca948a39433738d050b20f0864238d5203abf3 100644 (file)
--- a/process.h
+++ b/process.h
@@ -98,10 +98,10 @@ private:
     double expected_load;       // expected load in bookkeeping mode
 
     // Load-balancing loop
     double expected_load;       // expected load in bookkeeping mode
 
     // Load-balancing loop

+    msg_thread* lb_thread;

     void load_balance_loop();
 
     // Simulate computation loop
     void load_balance_loop();
 
     // Simulate computation loop

-    msg_thread* compute_thread;

     void compute_loop();
 
     bool still_running();
     void compute_loop();
 
     bool still_running();