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("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);
"Messages specific for this msg example");
-void vm_migrate(msg_vm_t vm, msg_host_t dst_pm)
+static void vm_migrate(msg_vm_t vm, msg_host_t dst_pm)
{
msg_host_t src_pm = MSG_vm_get_pm(vm);
double mig_sta = MSG_get_clock();
mig_end - mig_sta);
}
-int migration_worker_main(int argc, char *argv[])
+static int migration_worker_main(int argc, char *argv[])
{
xbt_assert(argc == 3);
char *vm_name = argv[1];
return 0;
}
-void vm_migrate_async(msg_vm_t vm, msg_host_t dst_pm)
+static void vm_migrate_async(msg_vm_t vm, msg_host_t dst_pm)
{
const char *vm_name = MSG_vm_get_name(vm);
const char *dst_pm_name = MSG_host_get_name(dst_pm);
MSG_process_create_with_arguments(pr_name, migration_worker_main, NULL, host, 3, argv);
}
-int master_main(int argc, char *argv[])
+static int master_main(int argc, char *argv[])
{
xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
return 0;
}
-void launch_master(msg_host_t host)
+static void launch_master(msg_host_t host)
{
const char *pr_name = "master_";
char **argv = xbt_new(char *, 2);
"Messages specific for this msg example");
-int computation_fun(int argc, char *argv[])
+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());
return 0;
}
-void launch_computation_worker(msg_host_t host)
+static void launch_computation_worker(msg_host_t host)
{
const char *pr_name = "compute";
char **argv = xbt_new(char *, 2);
double clock_sta;
};
-int communication_tx_fun(int argc, char *argv[])
+static int communication_tx_fun(int argc, char *argv[])
{
xbt_assert(argc == 2);
const char *mbox = argv[1];
return 0;
}
-int communication_rx_fun(int argc, char *argv[])
+static int communication_rx_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());
return 0;
}
-void launch_communication_worker(msg_host_t tx_host, msg_host_t rx_host)
+static void launch_communication_worker(msg_host_t tx_host, msg_host_t rx_host)
{
char *mbox = bprintf("MBOX:%s-%s",
MSG_host_get_name(tx_host),
MSG_host_get_name(rx_host));
char **argv = NULL;
- char *pr_name = NULL;
-
- pr_name = "comm_tx";
+
+ const char *pr_name_tx = "comm_tx";
argv = xbt_new(char *, 3);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = xbt_strdup(pr_name_tx);
argv[1] = xbt_strdup(mbox);
argv[2] = NULL;
- MSG_process_create_with_arguments(pr_name, communication_tx_fun, NULL, tx_host, 2, argv);
+ MSG_process_create_with_arguments(pr_name_tx, communication_tx_fun, NULL, tx_host, 2, argv);
- pr_name = "comm_rx";
+ const char *pr_name_rx = "comm_rx";
argv = xbt_new(char *, 3);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = xbt_strdup(pr_name_rx);
argv[1] = xbt_strdup(mbox);
argv[2] = NULL;
- MSG_process_create_with_arguments(pr_name, communication_rx_fun, NULL, rx_host, 2, argv);
+ MSG_process_create_with_arguments(pr_name_rx, communication_rx_fun, NULL, rx_host, 2, argv);
xbt_free(mbox);
}
-int master_main(int argc, char *argv[])
+static int master_main(int argc, char *argv[])
{
xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
return 0;
}
-void launch_master(msg_host_t host)
+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_t pr = MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
+ MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
}
} s_msg_comm_t;
+/******************************* VM *************************************/
+typedef struct dirty_page {
+ double prev_clock;
+ double prev_remaining;
+ msg_task_t task;
+} s_dirty_page, *dirty_page_t;
+
+XBT_PUBLIC_DATA(const char*) MSG_vm_get_property_value(msg_vm_t vm, const char *name);
+XBT_PUBLIC_DATA(xbt_dict_t) MSG_vm_get_properties(msg_vm_t vm);
+XBT_PUBLIC_DATA(void) MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_f_pvoid_t free_ctn);
+XBT_PUBLIC_DATA(msg_vm_t) MSG_vm_get_by_name(const char *name);
+XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm);
+XBT_PUBLIC_DATA(double) get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock);
+
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
static int migration_rx_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());
-
XBT_DEBUG("mig: rx_start");
xbt_assert(argc == 4);
return 0;
}
-
-typedef struct dirty_page {
- double prev_clock;
- double prev_remaining;
- msg_task_t task;
-} s_dirty_page, *dirty_page_t;
-
-
static void reset_dirty_pages(msg_vm_t vm)
{
msg_host_priv_t priv = msg_host_resource_priv(vm);
static int migration_tx_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());
-
XBT_DEBUG("mig: tx_start");
xbt_assert(argc == 4);
argv[3] = xbt_strdup(sg_host_name(dst_pm));
argv[4] = NULL;
- msg_process_t pr = MSG_process_create_with_arguments(pr_name, migration_rx_fun, NULL, dst_pm, nargvs - 1, argv);
+ MSG_process_create_with_arguments(pr_name, migration_rx_fun, NULL, dst_pm, nargvs - 1, argv);
xbt_free(pr_name);
}
argv[2] = xbt_strdup(sg_host_name(src_pm));
argv[3] = xbt_strdup(sg_host_name(dst_pm));
argv[4] = NULL;
- msg_process_t pr = MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv);
+ MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv);
xbt_free(pr_name);
}
{
XBT_DEBUG("Destroy action %p", action);
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
- smx_host_t host = action->sleep.host;
- surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);
long total_ramsize_of_vms = 0;
xbt_dynar_t dyn_vms = surf_workstation_model->extension.workstation.get_vms(pm);
{
- int cursor = 0;
+ unsigned int cursor = 0;
smx_host_t another_vm;
xbt_dynar_foreach(dyn_vms, cursor, another_vm) {
long another_vm_ramsize = host_get_ramsize(vm, NULL);
*/
void SIMIX_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst_pm)
{
- const char *name = SIMIX_host_get_name(ind_vm);
-
/* precopy migration makes the VM temporally paused */
e_surf_vm_state_t state = SIMIX_vm_get_state(ind_vm);
xbt_assert(state == SURF_VM_STATE_SUSPENDED);
xbt_assert((ind_vm != NULL), "Invalid parameters");
const char *hostname = SIMIX_host_get_name(ind_vm);
- smx_host_priv_t host_priv = SIMIX_host_priv(ind_vm);
-
/* this will call the registered callback function, i.e., SIMIX_host_destroy(). */
xbt_lib_unset(host_lib, hostname, SIMIX_HOST_LEVEL, 1);
xbt_heap_free(cpu_ti_action_heap);
}
-surf_model_t surf_cpu_ti_model_init_internal(void)
+static surf_model_t surf_cpu_ti_model_init_internal(void)
{
s_surf_action_t action;
s_cpu_ti_t cpu;
continue;
/* It is a virtual machine, so we can cast it to workstation_VM2013_t */
- workstation_VM2013_t ws_vm2013 = (workstation_VM2013_t) ws_clm03;
{
- void *ind_sub_host = xbt_lib_get_elm_or_null(host_lib, ws_vm2013->sub_ws->generic_resource.name);
#if 0
+ workstation_VM2013_t ws_vm2013 = (workstation_VM2013_t) ws_clm03;
XBT_INFO("cost %f remains %f start %f finish %f", ws_vm2013->cpu_action->cost,
ws_vm2013->cpu_action->remains,
ws_vm2013->cpu_action->start,
);
#endif
#if 0
+ void *ind_sub_host = xbt_lib_get_elm_or_null(host_lib, ws_vm2013->sub_ws->generic_resource.name);
surf_cpu_model_pm->action_unref(ws_vm2013->cpu_action);
/* FIXME: this means busy loop? */
// ws_vm2013->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_sub_host, GUESTOS_NOISE);
/* Adding a task to a VM updates the VCPU task on its physical machine. */
-surf_action_t vm_ws_execute(void *workstation, double size)
+static surf_action_t vm_ws_execute(void *workstation, double size)
{
surf_resource_t ws = ((surf_resource_t) surf_workstation_resource_priv(workstation));