X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..0c61ca197fedf0bb0f86b540e750e9da26a0bd2d:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index 2ff44aa9a1..534e331e0f 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -28,13 +28,12 @@ smx_host_t SIMIX_host_create(const char *name, s_smx_process_t proc; /* Host structure */ - smx_host->data = data; smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); /* Update global variables */ xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host); - + return xbt_lib_get_elm_or_null(host_lib, name); } @@ -54,36 +53,41 @@ void SIMIX_host_on(smx_host_t 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; iargc; 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); } } } @@ -103,9 +107,9 @@ void SIMIX_host_off(smx_host_t h, smx_process_t 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) { @@ -116,6 +120,14 @@ void SIMIX_host_off(smx_host_t h, smx_process_t issuer) } } } + /*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);*/ } /** @@ -148,7 +160,7 @@ void SIMIX_host_destroy(void *h) xbt_swag_free(host->process_list); /* Clean host structure */ - free(host); + free(host); return; } @@ -310,30 +322,6 @@ int SIMIX_host_get_state(smx_host_t host){ return surf_resource_get_state(surf_workstation_resource_priv(host)); } -void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){ - return SIMIX_host_self_get_data(); -} -void* SIMIX_host_self_get_data(void) -{ - smx_host_t self = SIMIX_host_self(); - return SIMIX_host_get_data(self); -} - -void SIMIX_host_self_set_data(void *data) -{ - smx_host_t self = SIMIX_host_self(); - SIMIX_host_set_data(self, data); -} - -void* SIMIX_pre_host_get_data(smx_simcall_t simcall,smx_host_t host){ - return SIMIX_host_get_data(host); -} -void* SIMIX_host_get_data(smx_host_t host){ - xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - - return SIMIX_host_priv(host)->data; -} - void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(void**)data; @@ -416,7 +404,8 @@ void SIMIX_host_restart_processes(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], @@ -447,16 +436,6 @@ void SIMIX_host_autorestart(smx_host_t host) xbt_die("No function for simix_global->autorestart"); } -void SIMIX_pre_host_set_data(smx_simcall_t simcall, smx_host_t host, void *data) { - SIMIX_host_set_data(host, data); -} -void SIMIX_host_set_data(smx_host_t host, void *data){ - xbt_assert((host != NULL), "Invalid parameters"); - xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set"); - - SIMIX_host_priv(host)->data = data; -} - smx_action_t SIMIX_pre_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); @@ -497,7 +476,7 @@ smx_action_t SIMIX_host_execute(const char *name, } } - XBT_DEBUG("Create execute action %p", action); + XBT_DEBUG("Create execute action %p: %s", action, action->name); return action; } @@ -559,15 +538,6 @@ smx_action_t SIMIX_host_parallel_execute(const char *name, 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){ SIMIX_host_execution_destroy(action); } @@ -793,12 +763,22 @@ void SIMIX_pre_host_set_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_para 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 SIMIX_pre_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 SIMIX_pre_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); }