A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Avoid warnings about renamed options with --help-aliases.
[simgrid.git]
/
examples
/
msg
/
cloud-two-tasks
/
cloud-two-tasks.c
diff --git
a/examples/msg/cloud-two-tasks/cloud-two-tasks.c
b/examples/msg/cloud-two-tasks/cloud-two-tasks.c
index
285a69a
..
e8b2d0b
100644
(file)
--- a/
examples/msg/cloud-two-tasks/cloud-two-tasks.c
+++ b/
examples/msg/cloud-two-tasks/cloud-two-tasks.c
@@
-14,12
+14,11
@@
static int computation_fun(int argc, char *argv[])
{
const char *pr_name = MSG_process_get_name(MSG_process_self());
const char *host_name = MSG_host_get_name(MSG_host_self());
- double clock_sta, clock_end;
atask = MSG_task_create("Task1", 1e9, 1e9, NULL);
- clock_sta = MSG_get_clock();
+
double
clock_sta = MSG_get_clock();
XBT_INFO("%s:%s task 1 created %g", host_name, pr_name, clock_sta);
MSG_task_execute(atask);
- clock_end = MSG_get_clock();
+
double
clock_end = MSG_get_clock();
XBT_INFO("%s:%s task 1 executed %g", host_name, pr_name, clock_end - clock_sta);
@@
-57,17
+56,15
@@
static int master_main(int argc, char *argv[])
{
xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
msg_host_t pm0 = MSG_host_by_name("Fafard");
- msg_vm_t vm0;
- vm0 = MSG_vm_create_core(pm0, "VM0");
+ msg_vm_t vm0 = MSG_vm_create_core(pm0, "VM0");
MSG_vm_start(vm0);
- //MSG_process_sleep(1);
- launch_computation_worker(vm0);
+ launch_computation_worker(
(msg_host_t)
vm0);
while(MSG_get_clock()<100) {
- if (atask != NULL)
- XBT_INFO("aTask remaining duration: %g", MSG_task_get_flops_amount(atask));
- MSG_process_sleep(1);
+
if (atask != NULL)
+
XBT_INFO("aTask remaining duration: %g", MSG_task_get_flops_amount(atask));
+
MSG_process_sleep(1);
}
MSG_process_sleep(10000);
@@
-76,23
+73,13
@@
static int master_main(int argc, char *argv[])
return 1;
}
-static void launch_master(msg_host_t host)
-{
- const char *pr_name = "master_";
- char **argv = xbt_new(char *, 2);
- argv[0] = xbt_strdup(pr_name);
- argv[1] = NULL;
-
- MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
-}
-
int main(int argc, char *argv[]){
MSG_init(&argc, argv);
xbt_assert(argc == 2);
MSG_create_environment(argv[1]);
-
launch_master(
MSG_host_by_name("Fafard"));
+
MSG_process_create("master_", master_main, NULL,
MSG_host_by_name("Fafard"));
int res = MSG_main();
XBT_INFO("Bye (simulation time %g)", MSG_get_clock());