X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4895c3c3d812abc5ae8cce1d75580f7ed4bbf4f..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c

diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
index 6dda8b5a96..eebcf6da76 100644
--- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
+++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
@@ -1,172 +1,114 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <stdio.h>
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h"         /* calloc, printf */
+#include "simgrid/msg.h"
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
-
-/** Emitter function  */
-int master(int argc, char *argv[])
+static int master(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   double task_comp_size = 5E7;
   double task_comm_size = 1E6;
-  double timeout = 1;
-
-  char mailbox[256];
-  msg_task_t task = NULL;
-  msg_comm_t comm = NULL;
-  xbt_ex_t ex;
-
-  sprintf(mailbox, "jupi");
+  double timeout        = 1;
 
-  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_t task = MSG_task_create("normal", task_comp_size, task_comm_size, NULL);
+  XBT_INFO("Sending task: \"%s\"", MSG_task_get_name(task));
+  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);
+  XBT_INFO("Canceling task \"%s\" directly", MSG_task_get_name(task));
   MSG_task_cancel(task);
   MSG_task_destroy(task);
 
   task = MSG_task_create("destroy directly", task_comp_size, task_comm_size, NULL);
-  XBT_INFO("Destroying task \"%s\" directly", task->name);
+  XBT_INFO("Destroying task \"%s\" directly", MSG_task_get_name(task));
   MSG_task_destroy(task);
 
-  task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
-  comm = MSG_task_isend(task, mailbox);
-  XBT_INFO("Canceling task \"%s\" during comm", task->name);
+  task            = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
+  msg_comm_t comm = MSG_task_isend(task, "worker_mailbox");
+  XBT_INFO("Canceling task \"%s\" during comm", MSG_task_get_name(task));
   MSG_task_cancel(task);
-  TRY {
-    MSG_comm_wait(comm, -1);
-  }
-  CATCH (ex) {
-    xbt_ex_free(ex);
+  if (MSG_comm_wait(comm, -1) != MSG_OK)
     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);
-  XBT_INFO("Destroying task \"%s\" during comm", task->name);
+  comm = MSG_task_isend(task, "worker_mailbox");
+  XBT_INFO("Destroying task \"%s\" during comm", MSG_task_get_name(task));
   MSG_task_destroy(task);
-  TRY {
-    MSG_comm_wait(comm, -1);
-  }
-  CATCH (ex) {
-    xbt_ex_free(ex);
+  if (MSG_comm_wait(comm, -1) != MSG_OK)
     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);
-  MSG_task_send_with_timeout(task, mailbox, timeout);
+  MSG_task_send_with_timeout(task, "worker_mailbox", timeout);
 
   XBT_INFO("Goodbye now!");
   return 0;
-}                               /* end_of_master */
+}
 
-static int worker_main(int argc, char *argv[])
+static int worker_main(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
-  msg_task_t task = MSG_process_get_data(MSG_process_self());
+  msg_task_t task = (msg_task_t)MSG_process_get_data(MSG_process_self());
   msg_error_t res;
-  XBT_INFO("Start %s", task->name);
+  XBT_INFO("Start %s", MSG_task_get_name(task));
   res = MSG_task_execute(task);
   XBT_INFO("Task %s", res == MSG_OK ? "done" : "failed");
   MSG_task_destroy(task);
   return 0;
 }
 
-/** Receiver function  */
-int slave(int argc, char *argv[])
+static int worker(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
-  msg_task_t task;
-  _XBT_GNUC_UNUSED int res;
-  int id = -1;
-  char mailbox[80];
-  double start, end;
-  sprintf(mailbox, "jupi");
-
   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));
 
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
-      XBT_INFO("Destroying task \"%s\"", task->name);
+      XBT_INFO("Destroying task \"%s\"", MSG_task_get_name(task));
       MSG_task_destroy(task);
       break;
     }
 
     if (!strcmp(MSG_task_get_name(task), "cancel")) {
       MSG_process_create("worker1", worker_main, task, MSG_host_self());
-      XBT_INFO("Canceling task \"%s\"", task->name);
+      MSG_process_sleep(0.1);
+      XBT_INFO("Canceling task \"%s\"", MSG_task_get_name(task));
       MSG_task_cancel(task);
       continue;
     }
 
-    start = MSG_get_clock();
+    double start = MSG_get_clock();
     MSG_task_execute(task);
-    end = MSG_get_clock();
-    XBT_INFO("Task \"%s\" done in %f (amount %f)"
-    		, MSG_task_get_name(task)
-    		, end - start
-    		, MSG_task_get_remaining_computation(task));
+    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);
-    task = NULL;
-    id--;
   }
   XBT_INFO("I'm done. See you!");
   return 0;
-}                               /* end_of_slave */
+}
 
-/** Main function */
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-  msg_error_t res;
-  const char *platform_file;
-  const char *application_file;
-
   MSG_init(&argc, argv);
-  if (argc != 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
-    exit(1);
-  }
-  platform_file = argv[1];
-  application_file = argv[2];
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  /* MSG_config("workstation/model","KCCFLN05"); */
-  {                             /*  Simulation setting */
-    MSG_create_environment(platform_file);
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("master", master);
-    MSG_function_register("slave", slave);
+  MSG_create_environment(argv[1]);
 
-    MSG_launch_application(application_file);
-  }
-  res = MSG_main();
+  MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("worker", worker, NULL, MSG_get_host_by_name("Jupiter"));
+
+  msg_error_t res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}