/* Update global variables */
xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host);
-
+
return xbt_lib_get_elm_or_null(host_lib, name);
}
-void SIMIX_pre_host_on(smx_simcall_t simcall, smx_host_t h)
+void simcall_HANDLER_host_on(smx_simcall_t simcall, smx_host_t h)
{
SIMIX_host_on(h);
}
xbt_assert((host != NULL), "Invalid parameters");
if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_OFF) {
- surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON);
+ surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON);
+
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_foreach(host->boot_processes,cpt,arg) {
smx_process_t process;
+ char** argv = xbt_new(char*, arg->argc);
+ for (int i=0; i<arg->argc; i++)
+ argv[i] = xbt_strdup(arg->argv[i]);
+
XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname);
if (simix_global->create_process_function) {
simix_global->create_process_function(&process,
- arg->argv[0],
+ argv[0],
arg->code,
NULL,
arg->hostname,
arg->kill_time,
arg->argc,
- arg->argv,
+ argv,
arg->properties,
- arg->auto_restart);
- }
- else {
+ arg->auto_restart,
+ NULL);
+ } else {
simcall_process_create(&process,
- arg->argv[0],
- arg->code,
- NULL,
- arg->hostname,
- arg->kill_time,
- arg->argc,
- arg->argv,
- arg->properties,
- arg->auto_restart);
+ arg->argv[0],
+ arg->code,
+ NULL,
+ arg->hostname,
+ arg->kill_time,
+ arg->argc,
+ argv,
+ arg->properties,
+ arg->auto_restart);
}
}
}
}
-void SIMIX_pre_host_off(smx_simcall_t simcall, smx_host_t h)
+void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
{
SIMIX_host_off(h, simcall->issuer);
}
smx_host_priv_t host = SIMIX_host_priv(h);
xbt_assert((host != NULL), "Invalid parameters");
-
- if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_OFF) {
- surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON);
+
+ if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_ON) {
+ surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_OFF);
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
}
}
}
+ /*xbt_dynar_t vms = surf_workstation_get_vms(h);
+ unsigned int cpt;
+ smx_host_t vm;
+ xbt_dynar_foreach(vms, cpt, vm) {
+ SIMIX_vm_shutdown(vm, issuer);
+ SIMIX_vm_destroy(vm);
+ }
+ xbt_dynar_free(&vms);*/
}
/**
xbt_swag_free(host->process_list);
/* Clean host structure */
- free(host);
+ free(host);
return;
}
-///**
-// * \brief Returns a dict of all hosts.
-// *
-// * \return List of all hosts (as a #xbt_dict_t)
-// */
-//xbt_dict_t SIMIX_host_get_dict(void)
-//{
-// xbt_dict_t host_dict = xbt_dict_new_homogeneous(NULL);
-// xbt_lib_cursor_t cursor = NULL;
-// char *name = NULL;
-// void **host = NULL;
-//
-// xbt_lib_foreach(host_lib, cursor, name, host){
-// if(host[SIMIX_HOST_LEVEL])
-// xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL], NULL);
-// }
-// return host_dict;
-//}
-smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t simcall, const char *name){
+smx_host_t simcall_HANDLER_host_get_by_name(smx_simcall_t simcall, const char *name){
return SIMIX_host_get_by_name(name);
}
smx_host_t SIMIX_host_get_by_name(const char *name){
return (process == NULL) ? NULL : SIMIX_process_get_host(process);
}
-const char* SIMIX_pre_host_self_get_name(smx_simcall_t simcall){
+const char* simcall_HANDLER_host_self_get_name(smx_simcall_t simcall){
return SIMIX_host_self_get_name();
}
/* needs to be public and without simcall because it is called
return SIMIX_host_get_name(host);
}
-const char* SIMIX_pre_host_get_name(smx_simcall_t simcall, smx_host_t host){
+const char* simcall_HANDLER_host_get_name(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_name(host);
}
const char* SIMIX_host_get_name(smx_host_t host){
return sg_host_name(host);
}
-xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host){
+xbt_dict_t simcall_HANDLER_host_get_properties(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_properties(host);
}
xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
return surf_resource_get_properties(surf_workstation_resource_priv(host));
}
-double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){
+double simcall_HANDLER_host_get_speed(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_speed(host);
}
double SIMIX_host_get_speed(smx_host_t host){
return surf_workstation_get_speed(host, 1.0);
}
-int SIMIX_pre_host_get_core(smx_simcall_t simcall, smx_host_t host){
+int simcall_HANDLER_host_get_core(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_core(host);
}
int SIMIX_host_get_core(smx_host_t host){
return surf_workstation_get_core(host);
}
-xbt_swag_t SIMIX_pre_host_get_process_list(smx_simcall_t simcall, smx_host_t host){
+xbt_swag_t simcall_HANDLER_host_get_process_list(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_process_list(host);
}
}
-double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){
+double simcall_HANDLER_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_available_speed(host);
}
double SIMIX_host_get_available_speed(smx_host_t host){
return surf_workstation_get_available_speed(host);
}
-double SIMIX_pre_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t host){
+double simcall_HANDLER_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_current_power_peak(host);
}
double SIMIX_host_get_current_power_peak(smx_host_t host) {
return surf_workstation_get_current_power_peak(host);
}
-double SIMIX_pre_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+double simcall_HANDLER_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
return SIMIX_host_get_power_peak_at(host, pstate_index);
}
double SIMIX_host_get_power_peak_at(smx_host_t host, int pstate_index) {
return surf_workstation_get_power_peak_at(host, pstate_index);
}
-int SIMIX_pre_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){
+int simcall_HANDLER_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_nb_pstates(host);
}
int SIMIX_host_get_nb_pstates(smx_host_t host) {
}
-void SIMIX_pre_host_set_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+void simcall_HANDLER_host_set_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
SIMIX_host_set_power_peak_at(host, pstate_index);
}
void SIMIX_host_set_power_peak_at(smx_host_t host, int pstate_index) {
surf_workstation_set_power_peak_at(host, pstate_index);
}
-double SIMIX_pre_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host){
+double simcall_HANDLER_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_consumed_energy(host);
}
double SIMIX_host_get_consumed_energy(smx_host_t host) {
return surf_workstation_get_consumed_energy(host);
}
-int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){
+int simcall_HANDLER_host_get_state(smx_simcall_t simcall, smx_host_t host){
return SIMIX_host_get_state(host);
}
int SIMIX_host_get_state(smx_host_t host){
arg->argc,
arg->argv,
arg->properties,
- arg->auto_restart);
+ arg->auto_restart,
+ NULL);
} else {
simcall_process_create(&process,
arg->argv[0],
xbt_die("No function for simix_global->autorestart");
}
-smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name,
+smx_action_t simcall_HANDLER_host_execute(smx_simcall_t simcall,const char *name,
smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask){
return SIMIX_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
}
}
}
- XBT_DEBUG("Create execute action %p", action);
+ XBT_DEBUG("Create execute action %p: %s", action, action->name);
return action;
}
-smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t simcall, const char *name,
+smx_action_t simcall_HANDLER_host_parallel_execute(smx_simcall_t simcall, const char *name,
int host_nb, smx_host_t *host_list,
double *computation_amount, double *communication_amount,
double amount, double rate){
return action;
}
-//FIXME: REMOVE not used
-static surf_model_t get_ws_model_from_action(smx_action_t action)
-{
- xbt_assert(action->type == SIMIX_ACTION_EXECUTE);
- smx_host_t host = action->execution.host;
- surf_model_t model = surf_resource_model(host, SURF_WKS_LEVEL);
- return model;
-}
-
-void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
+void simcall_HANDLER_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
SIMIX_host_execution_destroy(action);
}
void SIMIX_host_execution_destroy(smx_action_t action){
xbt_mallocator_release(simix_global->action_mallocator, action);
}
-void SIMIX_pre_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){
+void simcall_HANDLER_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){
SIMIX_host_execution_cancel(action);
}
void SIMIX_host_execution_cancel(smx_action_t action){
surf_action_cancel(action->execution.surf_exec);
}
-double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){
+double simcall_HANDLER_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){
return SIMIX_host_execution_get_remains(action);
}
double SIMIX_host_execution_get_remains(smx_action_t action){
return result;
}
-e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){
+e_smx_state_t simcall_HANDLER_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){
return SIMIX_host_execution_get_state(action);
}
e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){
return action->state;
}
-void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action,
+void simcall_HANDLER_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action,
double priority){
SIMIX_host_execution_set_priority(action, priority);
}
surf_action_set_priority(action->execution.surf_exec, priority);
}
-void SIMIX_pre_host_execution_set_bound(smx_simcall_t simcall, smx_action_t action,
+void simcall_HANDLER_host_execution_set_bound(smx_simcall_t simcall, smx_action_t action,
double bound){
SIMIX_host_execution_set_bound(action, bound);
}
surf_cpu_action_set_bound(action->execution.surf_exec, bound);
}
-void SIMIX_pre_host_execution_set_affinity(smx_simcall_t simcall,
+void simcall_HANDLER_host_execution_set_affinity(smx_simcall_t simcall,
smx_action_t action, smx_host_t host, unsigned long mask){
SIMIX_host_execution_set_affinity(action, host, mask);
}
}
}
-void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){
+void simcall_HANDLER_host_execution_wait(smx_simcall_t simcall, smx_action_t action){
XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state);
#ifdef HAVE_TRACING
-void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action,
+void simcall_HANDLER_set_category(smx_simcall_t simcall, smx_action_t action,
const char *category){
SIMIX_set_category(action, category);
}
surf_workstation_get_params(ind_vm, params);
}
-void SIMIX_pre_host_get_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params)
+void simcall_HANDLER_host_get_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params)
{
SIMIX_host_get_params(ind_vm, params);
}
surf_workstation_set_params(ind_vm, params);
}
-void SIMIX_pre_host_set_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params)
+void simcall_HANDLER_host_set_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params)
{
SIMIX_host_set_params(ind_vm, params);
}
-xbt_dict_t SIMIX_pre_host_get_storage_list(smx_simcall_t simcall, smx_host_t host){
- return SIMIX_host_get_storage_list(host);
+xbt_dict_t simcall_HANDLER_host_get_mounted_storage_list(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_mounted_storage_list(host);
+}
+
+xbt_dict_t SIMIX_host_get_mounted_storage_list(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ return surf_workstation_get_mounted_storage_list(host);
+}
+
+xbt_dynar_t simcall_HANDLER_host_get_attached_storage_list(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_attached_storage_list(host);
}
-xbt_dict_t SIMIX_host_get_storage_list(smx_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(smx_host_t host){
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_workstation_get_storage_list(host);
+ return surf_workstation_get_attached_storage_list(host);
}
