Completely remove channel mecanism with tesh tested examples.

[simgrid.git] / examples / msg / icomms / peer3.c

diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c
index ffde174..a86a0cc 100644 (file)
--- a/examples/msg/icomms/peer3.c
+++ b/examples/msg/icomms/peer3.c
@@ -64,12 +64,12 @@ int sender(int argc, char *argv[])
   sprintf(mailbox, "finalize");
 
   msg_comm_t res_irecv;
-  MSG_error_t res_wait;
+  _XBT_GNUC_UNUSED MSG_error_t res_wait;
   for (i = 0; i < receivers_count; i++) {
     task = NULL;
     res_irecv = MSG_task_irecv(&(task), mailbox);
     res_wait = MSG_comm_wait(res_irecv, -1);
-    xbt_assert0(res_wait == MSG_OK, "MSG_comm_wait failed");
+    xbt_assert(res_wait == MSG_OK, "MSG_comm_wait failed");
     MSG_comm_destroy(res_irecv);
     MSG_task_destroy(task);
   }
@@ -88,9 +88,9 @@ int receiver(int argc, char *argv[])
   int tasks = atof(argv[2]);
   m_task_t *task = xbt_new(m_task_t, tasks);
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[1], "%d", &id);
-  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
   sprintf(mailbox, "receiver-%d", id);
   MSG_process_sleep(10);
   msg_comm_t res_irecv;
@@ -104,7 +104,7 @@ int receiver(int argc, char *argv[])
   /* Here we are waiting for the receiving of all communications */
   m_task_t task_com;
   while (!xbt_dynar_is_empty(comms)) {
-    MSG_error_t err;
+    _XBT_GNUC_UNUSED MSG_error_t err;
     xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
     task_com = MSG_comm_get_task(res_irecv);
     MSG_comm_destroy(res_irecv);
@@ -112,7 +112,7 @@ int receiver(int argc, char *argv[])
     MSG_task_execute(task_com);
     XBT_INFO("\"%s\" done", MSG_task_get_name(task_com));
     err = MSG_task_destroy(task_com);
-    xbt_assert0(err == MSG_OK, "MSG_task_destroy failed");
+    xbt_assert(err == MSG_OK, "MSG_task_destroy failed");
   }
   xbt_dynar_free(&comms);
   xbt_free(task);
@@ -134,7 +134,6 @@ MSG_error_t test_all(const char *platform_file,
 
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
-    MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */