-/* Copyright (c) 2007-2012. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2013. 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. */
msg_host_t *pms = xbt_new(msg_host_t, workers_count);
xbt_dynar_t vms = xbt_dynar_new(sizeof(msg_vm_t), NULL);
- /* Retrive the PMs that will launch worker processes. */
+ /* Retrieve the PMs that will launch worker processes. */
for (i = 1; i < argc; i++)
pms[i - 1] = MSG_get_host_by_name(argv[i]);
/* Launch VMs and worker processes. One VM per PM, and one worker process per VM. */
- XBT_INFO("Launch %ld 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);
XBT_INFO("create %s", vm_name);
msg_vm_t vm = MSG_vm_create_core(pms[i], vm_name);
+
+ s_ws_params_t params;
+ memset(¶ms, 0, sizeof(params));
+ params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes
+ MSG_host_set_params(vm, ¶ms);
+
MSG_vm_start(vm);
xbt_dynar_push(vms, &vm);
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;
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("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);