X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/101fcbed03bfeed4271fba2743468355ba004e79..a0d47b6eaf07218a602ed6606da925fbd3629909:/examples/c/energy-exec-ptask/energy-exec-ptask.c

diff --git a/examples/c/energy-exec-ptask/energy-exec-ptask.c b/examples/c/energy-exec-ptask/energy-exec-ptask.c
index f4e9888972..988f7fcc03 100644
--- a/examples/c/energy-exec-ptask/energy-exec-ptask.c
+++ b/examples/c/energy-exec-ptask/energy-exec-ptask.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -8,22 +8,22 @@
 #include "simgrid/exec.h"
 #include "simgrid/host.h"
 #include "simgrid/plugins/energy.h"
-#include "xbt/asserts.h"
 #include "xbt/config.h"
 #include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(energy_exec_ptask, "Messages specific for this example");
 
-static void runner(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
+static void runner(int argc, char* argv[])
 {
   /* Retrieve the list of all hosts as an array of hosts */
-  int host_count   = sg_host_count();
+  int host_count   = (int)sg_host_count();
   sg_host_t* hosts = sg_host_list();
 
   XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, "
            "and 10MB to exchange between each pair");
-  double* computation_amounts   = (double*)calloc(host_count, sizeof(double));
-  double* communication_amounts = (double*)calloc(host_count * host_count, sizeof(double));
+  double* computation_amounts   = xbt_new0(double, host_count);
+  double* communication_amounts = xbt_new0(double, host_count * host_count);
 
   for (int i = 0; i < host_count; i++)
     computation_amounts[i] = 1e9; // 1 Gflop
@@ -34,12 +34,12 @@ static void runner(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 
   sg_actor_parallel_execute(host_count, hosts, computation_amounts, communication_amounts);
 
-  free(communication_amounts);
-  free(computation_amounts);
+  xbt_free(communication_amounts);
+  xbt_free(computation_amounts);
 
   XBT_INFO("We can do the same with a timeout of one second enabled.");
-  computation_amounts   = (double*)calloc(host_count, sizeof(double));
-  communication_amounts = (double*)calloc(host_count * host_count, sizeof(double));
+  computation_amounts   = xbt_new0(double, host_count);
+  communication_amounts = xbt_new0(double, host_count * host_count);
   for (int i = 0; i < host_count; i++)
     computation_amounts[i] = 1e9; // 1 Gflop
   for (int i = 0; i < host_count; i++)
@@ -47,34 +47,35 @@ static void runner(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
       communication_amounts[i * host_count + j] = 1e7; // 10 MB
 
   sg_exec_t exec = sg_actor_parallel_exec_init(host_count, hosts, computation_amounts, communication_amounts);
-  sg_exec_wait_for(exec, 1 /* timeout (in seconds)*/);
-  free(communication_amounts);
-  free(computation_amounts);
+  if (sg_exec_wait_for(exec, 1 /* timeout (in seconds)*/) == SG_ERROR_TIMEOUT)
+    sg_exec_cancel(exec);
+  xbt_free(communication_amounts);
+  xbt_free(computation_amounts);
 
   XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)");
-  computation_amounts = (double*)calloc(host_count, sizeof(double));
+  computation_amounts = xbt_new0(double, host_count);
   for (int i = 0; i < host_count; i++)
     computation_amounts[i] = 1e9; // 1 Gflop
   sg_actor_parallel_execute(host_count, hosts, computation_amounts, NULL);
-  free(computation_amounts);
+  xbt_free(computation_amounts);
 
   XBT_INFO("Then, build a parallel task with no computation nor communication (synchro only)");
-  computation_amounts   = (double*)calloc(host_count, sizeof(double));
-  communication_amounts = (double*)calloc(host_count * host_count, sizeof(double));
+  computation_amounts   = xbt_new0(double, host_count);
+  communication_amounts = xbt_new0(double, host_count * host_count);
   sg_actor_parallel_execute(host_count, hosts, computation_amounts, communication_amounts);
-  free(communication_amounts);
-  free(computation_amounts);
+  xbt_free(communication_amounts);
+  xbt_free(computation_amounts);
 
   XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", sg_host_get_name(hosts[1]));
-  computation_amounts    = (double*)calloc(1, sizeof(double));
+  computation_amounts    = xbt_new0(double, 1);
   computation_amounts[0] = 1e9; // 1 Gflop
   sg_host_t remote[1];
   remote[0] = hosts[1];
   sg_actor_parallel_execute(1, remote, computation_amounts, NULL /* no comm */);
-  free(computation_amounts);
+  xbt_free(computation_amounts);
 
   XBT_INFO("Goodbye now!");
-  free(hosts);
+  xbt_free(hosts);
 }
 
 int main(int argc, char* argv[])
@@ -90,13 +91,12 @@ int main(int argc, char* argv[])
 
   simgrid_load_platform(argv[1]);
 
-  /* Pick a process, no matter which, from the platform file */
+  /* Pick the first host from the platform file */
   sg_host_t* all_hosts = sg_host_list();
   sg_host_t first_host = all_hosts[0];
-  free(all_hosts);
+  xbt_free(all_hosts);
 
-  sg_actor_t actor = sg_actor_init("test", first_host);
-  sg_actor_start(actor, runner, 0, NULL);
+  sg_actor_create("test", first_host, runner, 0, NULL);
 
   simgrid_run();
   XBT_INFO("Simulation done.");