X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..e22835199e01cebc53351fdfaadbd43b2fa1859d:/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 c9afd7c6db..3dafdbdea3 100644 --- a/examples/msg/cloud-two-tasks/cloud-two-tasks.c +++ b/examples/msg/cloud-two-tasks/cloud-two-tasks.c @@ -42,54 +42,32 @@ static int computation_fun(int argc, char *argv[]) return 0; } -static void launch_computation_worker(msg_host_t host) -{ - const char *pr_name = "compute"; - char **argv = xbt_new(char *, 2); - argv[0] = xbt_strdup(pr_name); - argv[1] = NULL; - - MSG_process_create_with_arguments(pr_name, computation_fun, NULL, host, 1, argv); -} - 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 = MSG_vm_create_core(pm0, "VM0"); MSG_vm_start(vm0); - launch_computation_worker(vm0); + MSG_process_create("compute", computation_fun, NULL, (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_remaining_work_ratio(atask)); + MSG_process_sleep(1); } MSG_process_sleep(10000); MSG_vm_destroy(vm0); - xbt_dynar_free(&hosts_dynar); 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());