X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05400c7ba9980ef221912b7cee424a8e0a263866..274b996ead50456d7519b1cbd5d4f86e0a9154ec:/examples/msg/parallel_task/test_ptask.c

diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index f4a79a4e24..6d3d0e4dab 100644
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -20,18 +20,13 @@ int redistribute(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 
 int execute(int argc, char *argv[])
 {
   char buffer[32];
   int i, j;
-  m_host_t *m_host_list = NULL;
-  m_task_t task = NULL;
+  msg_host_t *m_host_list = NULL;
+  msg_task_t task = NULL;
   int host_list_size;
   double *computation_duration = NULL;
   double *communication_table = NULL;
@@ -42,18 +37,18 @@ int execute(int argc, char *argv[])
 
   host_list_size = argc - 3;
   XBT_DEBUG("host_list_size=%d", host_list_size);
-  m_host_list = calloc(host_list_size, sizeof(m_host_t));
+  m_host_list = calloc(host_list_size, sizeof(msg_host_t));
   for (i = 1; i <= host_list_size; i++) {
     m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
-    xbt_assert1(m_host_list[i - 1] != NULL,
+    xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[argc - 2], "%lg", &computation_amount);
-  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 2]);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 2]);
   read = sscanf(argv[argc - 1], "%lg", &communication_amount);
-  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 1]);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));
@@ -87,8 +82,8 @@ int redistribute(int argc, char *argv[])
 {
   char buffer[32];
   int i, j;
-  m_host_t *m_host_list = NULL;
-  m_task_t task = NULL;
+  msg_host_t *m_host_list = NULL;
+  msg_task_t task = NULL;
   int host_list_size;
   double *computation_duration = NULL;
   double *communication_table = NULL;
@@ -98,16 +93,16 @@ int redistribute(int argc, char *argv[])
 
   host_list_size = argc - 2;
   XBT_DEBUG("host_list_size=%d", host_list_size);
-  m_host_list = calloc(host_list_size, sizeof(m_host_t));
+  m_host_list = calloc(host_list_size, sizeof(msg_host_t));
   for (i = 1; i <= host_list_size; i++) {
     m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
-    xbt_assert1(m_host_list[i - 1] != NULL,
+    xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[argc - 1], "%lg", &communication_amount);
-  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 1]);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));
@@ -145,7 +140,6 @@ MSG_error_t test_all(const char *platform_file,
   MSG_config("workstation/model", "ptask_L07");
 
   /*  Simulation setting */
-  MSG_set_channel_number(MAX_CHANNEL);
   MSG_create_environment(platform_file);
 
   /*   Application deployment */
@@ -164,7 +158,7 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     exit(1);