X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7862d928239639a5fbde23866f80f1b234ff8396..ecd5f7562caf1d443bf22788fa5f4fac408776ec:/examples/msg/energy-ptask/energy-ptask.c
diff --git a/examples/msg/energy-ptask/energy-ptask.c b/examples/msg/energy-ptask/energy-ptask.c
index 46990fa126..d368bb1378 100644
--- a/examples/msg/energy-ptask/energy-ptask.c
+++ b/examples/msg/energy-ptask/energy-ptask.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
@@ -10,8 +9,8 @@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
/** @addtogroup MSG_examples
- *
- * - parallel_task/parallel_task.c: Demonstrates the use of @ref MSG_parallel_task_create, to create special
+ *
+ * - energy-ptask/energy-ptask.c: Demonstrates the use of @ref MSG_parallel_task_create, to create special
* tasks that run on several hosts at the same time. The resulting simulations are very close to what can be
* achieved in @ref SD_API, but still allows to use the other features of MSG (it'd be cool to be able to mix
* interfaces, but it's not possible ATM).
@@ -20,49 +19,75 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
static int runner(int argc, char *argv[])
{
/* Retrieve the list of all hosts as an array of hosts */
- xbt_dynar_t slaves_dynar = MSG_hosts_as_dynar();
- int slaves_count = xbt_dynar_length(slaves_dynar);
- msg_host_t *slaves = xbt_dynar_to_array(slaves_dynar);
+ int hosts_count = MSG_get_host_number();
+ msg_host_t *hosts = xbt_dynar_to_array(MSG_hosts_as_dynar());
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 = xbt_new0(double, slaves_count);
- double *communication_amounts = xbt_new0(double, slaves_count * slaves_count);
+ double *computation_amounts = xbt_new0(double, hosts_count);
+ double *communication_amounts = xbt_new0(double, hosts_count * hosts_count);
- for (int i = 0; i < slaves_count; i++)
+ for (int i = 0; i < hosts_count; i++)
computation_amounts[i] = 1e9; // 1 Gflop
- for (int i = 0; i < slaves_count; i++)
- for (int j = i + 1; j < slaves_count; j++)
- communication_amounts[i * slaves_count + j] = 1e7; // 10 MB
+ for (int i = 0; i < hosts_count; i++)
+ for (int j = i + 1; j < hosts_count; j++)
+ communication_amounts[i * hosts_count + j] = 1e7; // 10 MB
msg_task_t ptask =
- MSG_parallel_task_create("parallel task", slaves_count, slaves, computation_amounts, communication_amounts, NULL);
+ MSG_parallel_task_create("parallel task", hosts_count, hosts, computation_amounts, communication_amounts, NULL);
MSG_parallel_task_execute(ptask);
MSG_task_destroy(ptask);
- /* The arrays communication_amounts and computation_amounts are not to be freed manually */
+ 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 = xbt_new0(double, slaves_count);
- for (int i = 0; i < slaves_count; i++)
+ XBT_INFO("We can do the same with a timeout of one second enabled.");
+ computation_amounts = xbt_new0(double, hosts_count);
+ communication_amounts = xbt_new0(double, hosts_count* hosts_count);
+ for (int i = 0; i < hosts_count; i++)
computation_amounts[i] = 1e9; // 1 Gflop
+ for (int i = 0; i < hosts_count; i++)
+ for (int j = i + 1; j < hosts_count; j++)
+ communication_amounts[i * hosts_count + j] = 1e7; // 10 MB
ptask =
- MSG_parallel_task_create("parallel exec", slaves_count, slaves, computation_amounts, NULL/* no comm */, NULL);
+ MSG_parallel_task_create("parallel task", hosts_count, hosts, computation_amounts, communication_amounts, NULL);
+ msg_error_t errcode = MSG_parallel_task_execute_with_timeout(ptask, 1 /* timeout (in seconds)*/);
+ xbt_assert(errcode == MSG_TIMEOUT, "Woops, this did not timeout as expected... Please report that bug.");
+ MSG_task_destroy(ptask);
+ 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 = xbt_new0(double, hosts_count);
+ for (int i = 0; i < hosts_count; i++)
+ computation_amounts[i] = 1e9; // 1 Gflop
+ ptask = MSG_parallel_task_create("parallel exec", hosts_count, hosts, computation_amounts, NULL/* no comm */, NULL);
+ MSG_parallel_task_execute(ptask);
+ MSG_task_destroy(ptask);
+ xbt_free(computation_amounts);
+
+ XBT_INFO("Then, build a parallel task with no computation nor communication (synchro only)");
+ computation_amounts = xbt_new0(double, hosts_count);
+ communication_amounts = xbt_new0(double, hosts_count * hosts_count); /* memset to 0 by xbt_new0 */
+ ptask = MSG_parallel_task_create("parallel sync", hosts_count, hosts, computation_amounts, communication_amounts, NULL);
MSG_parallel_task_execute(ptask);
MSG_task_destroy(ptask);
+ xbt_free(communication_amounts);
+ xbt_free(computation_amounts);
- XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(slaves[1]));
+ XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(hosts[1]));
computation_amounts = xbt_new0(double, 1);
computation_amounts[0] = 1e9; // 1 Gflop
msg_host_t *remote = xbt_new(msg_host_t,1);
- remote[0] = slaves[1];
+ remote[0] = hosts[1];
ptask = MSG_parallel_task_create("remote exec", 1, remote, computation_amounts, NULL/* no comm */, NULL);
MSG_parallel_task_execute(ptask);
MSG_task_destroy(ptask);
- free(remote);
+ xbt_free(remote);
+ xbt_free(computation_amounts);
XBT_INFO("Goodbye now!");
- free(slaves);
+ xbt_free(hosts);
return 0;
}
@@ -75,7 +100,7 @@ int main(int argc, char *argv[])
xbt_assert(argc >= 2, "2Usage: %s [--energy]", argv[0]);
if(argc == 3 && argv[2][2] == 'e')
- sg_energy_plugin_init();
+ sg_host_energy_plugin_init();
MSG_create_environment(argv[1]);