casting an int to void* is not ok

But casting the result of atoi was ok, damn compiler.

diff --git a/examples/msg/mc/bugged2.c b/examples/msg/mc/bugged2.c
index bd916c0..a0376a8 100644 (file)
--- a/examples/msg/mc/bugged2.c
+++ b/examples/msg/mc/bugged2.c
@@ -25,13 +25,13 @@ int server(int argc, char *argv[])
   long val1, val2;
 
   MSG_task_receive(&task1, "mymailbox");
-  val1 = (long) MSG_task_get_data(task1);
+  val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
   MSG_task_destroy(task1);
   task1 = NULL;
   XBT_INFO("Received %lu", val1);
 
   MSG_task_receive(&task2, "mymailbox");
-  val2 = (long) MSG_task_get_data(task2);
+  val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
   MSG_task_destroy(task2);
   task2 = NULL;
   XBT_INFO("Received %lu", val2);
@@ -39,12 +39,12 @@ int server(int argc, char *argv[])
   MC_assert(min(val1, val2) == 1);
 
   MSG_task_receive(&task1, "mymailbox");
-  val1 = (long) MSG_task_get_data(task1);
+  val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
   MSG_task_destroy(task1);
   XBT_INFO("Received %lu", val1);
 
   MSG_task_receive(&task2, "mymailbox");
-  val2 = (long) MSG_task_get_data(task2);
+  val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
   MSG_task_destroy(task2);
   XBT_INFO("Received %lu", val2);
 
@@ -54,14 +54,13 @@ int server(int argc, char *argv[])
 
 int client(int argc, char *argv[])
 {
-  int ID = xbt_str_parse_int(argv[1], "Arg 1 is not a numerical ID: %s");
-  msg_task_t task1 = MSG_task_create("task", 0, 10000, (void *) ID);
-  msg_task_t task2 = MSG_task_create("task", 0, 10000, (void *) ID);
+  msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL);
+  msg_task_t task2 = MSG_task_create(argv[1], 0, 10000, NULL);
 
-  XBT_INFO("Send %d!", ID);
+  XBT_INFO("Send %s", argv[1]);
   MSG_task_send(task1, "mymailbox");
 
-  XBT_INFO("Send %d!", ID);
+  XBT_INFO("Send %s", argv[1]);
   MSG_task_send(task2, "mymailbox");
 
   return 0;
@@ -74,9 +73,7 @@ int main(int argc, char *argv[])
   MSG_create_environment("platform.xml");
 
   MSG_function_register("server", server);
-
   MSG_function_register("client", client);
-
   MSG_launch_application("deploy_bugged2.xml");
 
   MSG_main();

diff --git a/examples/msg/mc/bugged3.c b/examples/msg/mc/bugged3.c
index e43e802..c89b32d 100644 (file)
--- a/examples/msg/mc/bugged3.c
+++ b/examples/msg/mc/bugged3.c
@@ -23,16 +23,14 @@ int client(int argc, char *argv[]);
 
 int server(int argc, char *argv[])
 {
-  msg_task_t task1;
-  long val1;
-  msg_comm_t comm1, comm2;
+  msg_task_t task1,task2;
 
-  comm1 = MSG_task_irecv(&task1, "mymailbox1");
-  comm2 = MSG_task_irecv(&task1, "mymailbox2");
+  msg_comm_t comm1 = MSG_task_irecv(&task1, "mymailbox1");
+  msg_comm_t comm2 = MSG_task_irecv(&task2, "mymailbox2");
   MSG_comm_wait(comm1, -1);
   MSG_comm_wait(comm2, -1);
 
-  val1 = (long) MSG_task_get_data(task1);
+  long val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
   XBT_INFO("Received %lu", val1);
 
   MC_assert(val1 == 2);
@@ -43,12 +41,11 @@ int server(int argc, char *argv[])
 
 int client(int argc, char *argv[])
 {
-  int ID = xbt_str_parse_int(argv[1], "Arg 1 is not a numerical ID: %s");
-  msg_task_t task1 = MSG_task_create("task", 0, 10000, (void *) ID);
+  msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL);
 
   char *mbox = bprintf("mymailbox%s", argv[1]);
 
-  XBT_INFO("Send %d!", ID);
+  XBT_INFO("Send %s!", argv[1]);
   msg_comm_t comm = MSG_task_isend(task1, mbox);
   MSG_comm_wait(comm, -1);
 

diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/ns3/ns3.tesh
index 0574d33..d6da7fe 100644 (file)
--- a/examples/msg/ns3/ns3.tesh
+++ b/examples/msg/ns3/ns3.tesh
@@ -1,9 +1,7 @@
 #! ./tesh
 
-p In the NS3 tests, the timings are not shown because the exact values
-p may vary with your NS3 version. We just want to check that the NS3
-p bindings of SimGrid are working correctly, we don't want to
-p throughoutly test NS3.
+p In the NS3 tests, the timings are not shown because the exact values may vary with your NS3 version. 
+p We just want to check that the NS3 bindings of SimGrid are working correctly, we don't want to throughoutly test NS3.
 
 p 3hosts 2links