rework this test

diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.cpp b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.cpp
index c0df999..5841321 100644 (file)
--- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.cpp
+++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.cpp
@@ -15,11 +15,9 @@ static int master(int argc, char *argv[])
   double task_comm_size = 1E6;
   double timeout = 1;
 
   double task_comm_size = 1E6;
   double timeout = 1;
 

-  const char * mailbox = "jupi";
-

   msg_task_t task = MSG_task_create("normal", task_comp_size, task_comm_size, NULL);
   XBT_INFO("Sending task: \"%s\"", task->name);
   msg_task_t task = MSG_task_create("normal", task_comp_size, task_comm_size, NULL);
   XBT_INFO("Sending task: \"%s\"", task->name);

-  MSG_task_send_with_timeout(task, mailbox, timeout);
+  MSG_task_send_with_timeout(task, "worker_mailbox", timeout);

 
   task = MSG_task_create("cancel directly", task_comp_size, task_comm_size, NULL);
   XBT_INFO("Canceling task \"%s\" directly", task->name);
 
   task = MSG_task_create("cancel directly", task_comp_size, task_comm_size, NULL);
   XBT_INFO("Canceling task \"%s\" directly", task->name);


@@ -31,33 +29,33 @@ static int master(int argc, char *argv[])
   MSG_task_destroy(task);
 
   task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
   MSG_task_destroy(task);
 
   task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);

-  msg_comm_t comm = MSG_task_isend(task, mailbox);
+  msg_comm_t comm = MSG_task_isend(task, "worker_mailbox");

   XBT_INFO("Canceling task \"%s\" during comm", task->name);
   MSG_task_cancel(task);
   try {
     MSG_comm_wait(comm, -1);
   }
   XBT_INFO("Canceling task \"%s\" during comm", task->name);
   MSG_task_cancel(task);
   try {
     MSG_comm_wait(comm, -1);
   }

-  catch (xbt_ex& ex) {;
+  catch (xbt_ex& ex) {

     MSG_comm_destroy(comm);
   }
   MSG_task_destroy(task);
 
   task = MSG_task_create("finalize", task_comp_size, task_comm_size, NULL);
     MSG_comm_destroy(comm);
   }
   MSG_task_destroy(task);
 
   task = MSG_task_create("finalize", task_comp_size, task_comm_size, NULL);

-  comm = MSG_task_isend(task, mailbox);
+  comm = MSG_task_isend(task, "worker_mailbox");

   XBT_INFO("Destroying task \"%s\" during comm", task->name);
   MSG_task_destroy(task);
   try {
     MSG_comm_wait(comm, -1);
   }
   XBT_INFO("Destroying task \"%s\" during comm", task->name);
   MSG_task_destroy(task);
   try {
     MSG_comm_wait(comm, -1);
   }

-  catch (xbt_ex& ex) {;
+  catch (xbt_ex& ex) {

     MSG_comm_destroy(comm);
   }
 
   task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
     MSG_comm_destroy(comm);
   }
 
   task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);

-  MSG_task_send_with_timeout(task, mailbox, timeout);
+  MSG_task_send_with_timeout(task, "worker_mailbox", timeout);

 
   task = MSG_task_create("finalize", task_comp_size, task_comm_size, NULL);
 
   task = MSG_task_create("finalize", task_comp_size, task_comm_size, NULL);

-  MSG_task_send_with_timeout(task, mailbox, timeout);
+  MSG_task_send_with_timeout(task, "worker_mailbox", timeout);

 
   XBT_INFO("Goodbye now!");
   return 0;
 
   XBT_INFO("Goodbye now!");
   return 0;


@@ -74,17 +72,11 @@ static int worker_main(int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])

 {
 {

-  msg_task_t task;
-  XBT_ATTRIB_UNUSED int res;
-  int id = -1;
-  const char * mailbox = "jupi";
-  double start, end;
- 

   while (1) {
   while (1) {

-    task = NULL;
-    res = MSG_task_receive(&(task), mailbox);
+    msg_task_t task = NULL;
+    XBT_ATTRIB_UNUSED int res = MSG_task_receive(&(task), "worker_mailbox");

     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Handling task \"%s\"", MSG_task_get_name(task));
 
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
     XBT_INFO("Handling task \"%s\"", MSG_task_get_name(task));
 


@@ -102,15 +94,13 @@ static int slave(int argc, char *argv[])
       continue;
     }
 
       continue;
     }
 

-    start = MSG_get_clock();
+    double start = MSG_get_clock();

     MSG_task_execute(task);
     MSG_task_execute(task);

-    end = MSG_get_clock();
+    double end = MSG_get_clock();

     XBT_INFO("Task \"%s\" done in %f (amount %f)", MSG_task_get_name(task), end - start,
              MSG_task_get_flops_amount(task));
 
     MSG_task_destroy(task);
     XBT_INFO("Task \"%s\" done in %f (amount %f)", MSG_task_get_name(task), end - start,
              MSG_task_get_flops_amount(task));
 
     MSG_task_destroy(task);

-    task = NULL;
-    id--;

   }
   XBT_INFO("I'm done. See you!");
   return 0;
   }
   XBT_INFO("I'm done. See you!");
   return 0;


@@ -118,17 +108,15 @@ static int slave(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-  msg_error_t res;
-

   MSG_init(&argc, argv);
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
   MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
   MSG_init(&argc, argv);
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
   MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));

-  MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
+  MSG_process_create("worker", worker, NULL, MSG_get_host_by_name("Jupiter"));

 
 

-  res = MSG_main();
+  msg_error_t res = MSG_main();

 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 

diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
index 3a672ec..1484263 100644 (file)
--- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
+++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh
@@ -1,18 +1,17 @@
-

 $ ./task_destroy_cancel ${srcdir:=.}/../../../examples/platforms/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal"
 $ ./task_destroy_cancel ${srcdir:=.}/../../../examples/platforms/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal"

-> [Jupiter:slave:(2) 0.169155] [msg_test/INFO] Handling task "normal"
+> [Jupiter:worker:(2) 0.169155] [msg_test/INFO] Handling task "normal"

 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel directly" directly
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "destroy directly" directly
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel" during comm
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "finalize" during comm
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel directly" directly
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "destroy directly" directly
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel" during comm
 > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Destroying task "finalize" during comm

-> [Jupiter:slave:(2) 0.824497] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000)
-> [Jupiter:slave:(2) 0.993652] [msg_test/INFO] Handling task "cancel"
+> [Jupiter:worker:(2) 0.824497] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000)
+> [Jupiter:worker:(2) 0.993652] [msg_test/INFO] Handling task "cancel"

 > [Jupiter:worker1:(3) 0.993652] [msg_test/INFO] Start cancel
 > [Jupiter:worker1:(3) 0.993652] [msg_test/INFO] Start cancel

-> [Jupiter:slave:(2) 1.093652] [msg_test/INFO] Canceling task "cancel"
+> [Jupiter:worker:(2) 1.093652] [msg_test/INFO] Canceling task "cancel"

 > [Jupiter:worker1:(3) 1.093652] [msg_test/INFO] Task failed
 > [Tremblay:master:(1) 1.262806] [msg_test/INFO] Goodbye now!
 > [Jupiter:worker1:(3) 1.093652] [msg_test/INFO] Task failed
 > [Tremblay:master:(1) 1.262806] [msg_test/INFO] Goodbye now!

-> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] Handling task "finalize"
-> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] Destroying task "finalize"
-> [Jupiter:slave:(2) 1.262806] [msg_test/INFO] I'm done. See you!
+> [Jupiter:worker:(2) 1.262806] [msg_test/INFO] Handling task "finalize"
+> [Jupiter:worker:(2) 1.262806] [msg_test/INFO] Destroying task "finalize"
+> [Jupiter:worker:(2) 1.262806] [msg_test/INFO] I'm done. See you!

 > [1.262806] [msg_test/INFO] Simulation time 1.26281
 > [1.262806] [msg_test/INFO] Simulation time 1.26281