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
add a missing file and add MSG_vm_set_bound
[simgrid.git]
/
examples
/
msg
/
cloud
/
masterslave_virtual_machines.c
diff --git
a/examples/msg/cloud/masterslave_virtual_machines.c
b/examples/msg/cloud/masterslave_virtual_machines.c
index
ee927e3
..
830739a
100644
(file)
--- a/
examples/msg/cloud/masterslave_virtual_machines.c
+++ b/
examples/msg/cloud/masterslave_virtual_machines.c
@@
-60,7
+60,7
@@
int master_fun(int argc, char *argv[])
/* Launch VMs and worker processes. One VM per PM, and one worker process per VM. */
/* Launch VMs and worker processes. One VM per PM, and one worker process per VM. */
- XBT_INFO("Launch %
l
d VMs", workers_count);
+ XBT_INFO("Launch %d VMs", workers_count);
for (i=0; i< workers_count; i++) {
char *vm_name = bprintf("VM%02d", i);
char *pr_name = bprintf("WRK%02d", i);
for (i=0; i< workers_count; i++) {
char *vm_name = bprintf("VM%02d", i);
char *pr_name = bprintf("WRK%02d", i);
@@
-228,7
+228,7
@@
int main(int argc, char *argv[])
return 1;
}
return 1;
}
- msg_host_t master_pm;
+ msg_host_t master_pm
= NULL
;
char **master_argv = xbt_new(char *, 12);
master_argv[0] = xbt_strdup("master");
master_argv[11] = NULL;
char **master_argv = xbt_new(char *, 12);
master_argv[0] = xbt_strdup("master");
master_argv[11] = NULL;
@@
-247,12
+247,13
@@
int main(int argc, char *argv[])
break;
}
break;
}
+ msg_error_t res = 1;
+ if (master_pm!=NULL){
+ MSG_process_create_with_arguments("master", master_fun, NULL, master_pm, nb_hosts + 1, master_argv);
- MSG_process_create_with_arguments("master", master_fun, NULL, master_pm, nb_hosts + 1, master_argv);
-
- msg_error_t res = MSG_main();
- XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
-
+ res = MSG_main();
+ XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
+ }
xbt_dynar_free(&hosts_dynar);
return !(res == MSG_OK);
xbt_dynar_free(&hosts_dynar);
return !(res == MSG_OK);