X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ba79039f7b59f05275e5964eff9fda48d46fec3..8985a1134de89a845dd5fb959c9a1fe776b890bf:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index 248eb91851..2480bbdcf2 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012. The SimGrid Team. +/* Copyright (c) 2007-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -24,20 +24,18 @@ static void SIMIX_execution_finish(smx_action_t action); smx_host_t SIMIX_host_create(const char *name, void *workstation, void *data) { - smx_host_t smx_host = xbt_new0(s_smx_host_t, 1); + smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1); s_smx_process_t proc; /* Host structure */ - smx_host->name = xbt_strdup(name); smx_host->data = data; - smx_host->host = workstation; smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); /* Update global variables */ - xbt_lib_set(host_lib,smx_host->name,SIMIX_HOST_LEVEL,smx_host); + xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host); - return smx_host; + return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL); } /** @@ -47,14 +45,13 @@ smx_host_t SIMIX_host_create(const char *name, */ void SIMIX_host_destroy(void *h) { - smx_host_t host = (smx_host_t) h; + smx_host_priv_t host = (smx_host_priv_t) h; xbt_assert((host != NULL), "Invalid parameters"); /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { - char *msg = - bprintf("Shutting down host %s, but it's not empty:", host->name); + char *msg = xbt_strdup("Shutting down host, but it's not empty:"); char *tmp; smx_process_t process = NULL; @@ -70,38 +67,37 @@ void SIMIX_host_destroy(void *h) xbt_swag_free(host->process_list); /* Clean host structure */ - free(host->name); - 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_host_get_by_name(const char *name) -{ +///** +// * \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){ + return SIMIX_host_get_by_name(name); +} +smx_host_t SIMIX_host_get_by_name(const char *name){ xbt_assert(((simix_global != NULL) && (host_lib != NULL)), "Environment not set yet"); - return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL); + return xbt_lib_get_elm_or_null(host_lib, name); } smx_host_t SIMIX_host_self(void) @@ -110,6 +106,9 @@ smx_host_t SIMIX_host_self(void) return (process == NULL) ? NULL : SIMIX_process_get_host(process); } +const char* SIMIX_pre_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 by exceptions and logging events */ const char* SIMIX_host_self_get_name(void) @@ -121,64 +120,156 @@ const char* SIMIX_host_self_get_name(void) return SIMIX_host_get_name(host); } -const char* SIMIX_host_get_name(smx_host_t host) -{ +const char* SIMIX_pre_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){ xbt_assert((host != NULL), "Invalid parameters"); - return host->name; + return sg_host_name(host); } -xbt_dict_t SIMIX_host_get_properties(smx_host_t host) -{ +xbt_dict_t SIMIX_pre_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){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation.get_properties(host->host); + return surf_workstation_model->extension.workstation.get_properties(host); } -double SIMIX_host_get_speed(smx_host_t host) -{ +double SIMIX_pre_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){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); return surf_workstation_model->extension.workstation. - get_speed(host->host, 1.0); + get_speed(host, 1.0); } -double SIMIX_host_get_available_speed(smx_host_t host) -{ +int SIMIX_pre_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){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); return surf_workstation_model->extension.workstation. - get_available_speed(host->host); + get_core(host); } -int SIMIX_host_get_state(smx_host_t host) -{ +xbt_swag_t SIMIX_pre_host_get_process_list(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_process_list(host); +} + +xbt_swag_t SIMIX_host_get_process_list(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + smx_host_priv_t host_priv = SIMIX_host_priv(host); + + return host_priv->process_list; +} + + +double SIMIX_pre_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){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_model->extension.workstation. + get_available_speed(host); +} + +double SIMIX_pre_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) { + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + return surf_workstation_model->extension.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){ + return SIMIX_host_get_power_peak_at(host, pstate_index); +} +double SIMIX_host_get_power_peak_at(smx_host_t host, int pstate_index) { + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_model->extension.workstation. + get_power_peak_at(host, pstate_index); +} + +int SIMIX_pre_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) { + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_model->extension.workstation. + get_nb_pstates(host); +} + + +void SIMIX_pre_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) { + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + surf_workstation_model->extension.workstation. + set_power_peak_at(host, pstate_index); +} + +double SIMIX_pre_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) { + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + return surf_workstation_model->extension.workstation. + get_consumed_energy(host); +} + +int SIMIX_pre_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){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); return surf_workstation_model->extension.workstation. - get_state(host->host); + get_state(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) { - return SIMIX_host_get_data(SIMIX_host_self()); + smx_host_t self = SIMIX_host_self(); + return SIMIX_host_get_data(self); } void SIMIX_host_self_set_data(void *data) { - SIMIX_host_set_data(SIMIX_host_self(), data); + smx_host_t self = SIMIX_host_self(); + SIMIX_host_set_data(self, data); } -void* SIMIX_host_get_data(smx_host_t host) -{ +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 host->data; + return SIMIX_host_priv(host)->data; } -void _SIMIX_host_free_process_arg(void *); -void _SIMIX_host_free_process_arg(void *data) + +static void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(void**)data; + int i; + for (i = 0; i < arg->argc; i++) + xbt_free(arg->argv[i]); + xbt_free(arg->argv); xbt_free(arg->name); xbt_free(arg); } @@ -199,8 +290,8 @@ void SIMIX_host_add_auto_restart_process(smx_host_t host, xbt_dict_t properties, int auto_restart) { - if (!host->auto_restart_processes) { - host->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg); + if (!SIMIX_host_priv(host)->auto_restart_processes) { + SIMIX_host_priv(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg); } smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1); arg->name = xbt_strdup(name); @@ -210,22 +301,23 @@ void SIMIX_host_add_auto_restart_process(smx_host_t host, arg->kill_time = kill_time; arg->argc = argc; - arg->argv = xbt_new(char*,argc); + arg->argv = xbt_new(char*,argc + 1); int i; for (i = 0; i < argc; i++) { arg->argv[i] = xbt_strdup(argv[i]); } + arg->argv[argc] = NULL; arg->properties = properties; arg->auto_restart = auto_restart; if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF - && !xbt_dict_get_or_null(watched_hosts_lib,host->name)){ - xbt_dict_set(watched_hosts_lib,host->name,host,NULL); - XBT_DEBUG("Have push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",host->name); + && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_name(host))){ + xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL); + XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host)); } - xbt_dynar_push_as(host->auto_restart_processes,smx_process_arg_t,arg); + xbt_dynar_push_as(SIMIX_host_priv(host)->auto_restart_processes,smx_process_arg_t,arg); } /** * \brief Restart the list of processes that have been registered to the host @@ -234,7 +326,11 @@ void SIMIX_host_restart_processes(smx_host_t host) { unsigned int cpt; smx_process_arg_t arg; - xbt_dynar_foreach(host->auto_restart_processes,cpt,arg) { + xbt_dynar_t process_list = SIMIX_host_priv(host)->auto_restart_processes; + if (!process_list) + return; + + xbt_dynar_foreach (process_list, cpt, arg) { smx_process_t process; @@ -250,22 +346,26 @@ void SIMIX_host_restart_processes(smx_host_t host) arg->argv, arg->properties, arg->auto_restart); - } - else { + } 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, + arg->argv, + arg->properties, + arg->auto_restart); } + /* arg->argv is used by the process created above. Hide it to + * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset() + * below. */ + arg->argc = 0; + arg->argv = NULL; } - xbt_dynar_reset(host->auto_restart_processes); + xbt_dynar_reset(process_list); } void SIMIX_host_autorestart(smx_host_t host) @@ -276,18 +376,23 @@ void SIMIX_host_autorestart(smx_host_t host) xbt_die("No function for simix_global->autorestart"); } -void SIMIX_host_set_data(smx_host_t host, void *data) -{ +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((host->data == NULL), "Data already set"); + xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set"); - host->data = data; + SIMIX_host_priv(host)->data = data; } -smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, - double computation_amount, - double priority) -{ +smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name, + smx_host_t host, double computation_amount, double priority){ + return SIMIX_host_execute(name, host, computation_amount, priority); +} +smx_action_t SIMIX_host_execute(const char *name, + smx_host_t host, double computation_amount, double priority){ + /* alloc structures and initialize */ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator); action->type = SIMIX_ACTION_EXECUTE; @@ -300,9 +405,9 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, #endif /* set surf's action */ - if (!MC_IS_ENABLED) { + if (!MC_is_active()) { action->execution.surf_exec = - surf_workstation_model->extension.workstation.execute(host->host, + surf_workstation_model->extension.workstation.execute(host, computation_amount); surf_workstation_model->action_data_set(action->execution.surf_exec, action); surf_workstation_model->set_priority(action->execution.surf_exec, priority); @@ -313,11 +418,18 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, return action; } -smx_action_t SIMIX_host_parallel_execute( const char *name, +smx_action_t SIMIX_pre_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) -{ + double amount, double rate){ + return SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount, + communication_amount, amount, rate); +} +smx_action_t SIMIX_host_parallel_execute(const char *name, + int host_nb, smx_host_t *host_list, + double *computation_amount, double *communication_amount, + double amount, double rate){ + void **workstation_list = NULL; int i; @@ -335,10 +447,10 @@ smx_action_t SIMIX_host_parallel_execute( const char *name, /* set surf's action */ workstation_list = xbt_new0(void *, host_nb); for (i = 0; i < host_nb; i++) - workstation_list[i] = host_list[i]->host; + workstation_list[i] = host_list[i]; /* set surf's action */ - if (!MC_IS_ENABLED) { + if (!MC_is_active()) { action->execution.surf_exec = surf_workstation_model->extension.workstation. execute_parallel_task(host_nb, workstation_list, computation_amount, @@ -351,33 +463,34 @@ smx_action_t SIMIX_host_parallel_execute( const char *name, return action; } -void SIMIX_host_execution_destroy(smx_action_t action) -{ - int destroyed=0; +void SIMIX_pre_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_DEBUG("Destroy action %p", action); - if (action->execution.surf_exec) { - destroyed = surf_workstation_model->action_unref(action->execution.surf_exec); + surf_workstation_model->action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } - - if (destroyed) { - xbt_free(action->name); - xbt_mallocator_release(simix_global->action_mallocator, action); - } + xbt_free(action->name); + xbt_mallocator_release(simix_global->action_mallocator, action); } -void SIMIX_host_execution_cancel(smx_action_t action) -{ +void SIMIX_pre_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){ XBT_DEBUG("Cancel action %p", action); if (action->execution.surf_exec) surf_workstation_model->action_cancel(action->execution.surf_exec); } -double SIMIX_host_execution_get_remains(smx_action_t action) -{ +double SIMIX_pre_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){ double result = 0.0; if (action->state == SIMIX_RUNNING) @@ -386,20 +499,23 @@ double SIMIX_host_execution_get_remains(smx_action_t action) return result; } -e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action) -{ +e_smx_state_t SIMIX_pre_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_host_execution_set_priority(smx_action_t action, double priority) -{ +void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action, + double priority){ + return SIMIX_host_execution_set_priority(action, priority); +} +void SIMIX_host_execution_set_priority(smx_action_t action, double priority){ if(action->execution.surf_exec) surf_workstation_model->set_priority(action->execution.surf_exec, priority); } -void SIMIX_pre_host_execution_wait(smx_simcall_t simcall) -{ - smx_action_t action = simcall->host_execution_wait.execution; +void SIMIX_pre_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); @@ -408,7 +524,7 @@ void SIMIX_pre_host_execution_wait(smx_simcall_t simcall) simcall->issuer->waiting_action = action; /* set surf's action */ - if (MC_IS_ENABLED) { + if (MC_is_active()) { action->state = SIMIX_DONE; SIMIX_execution_finish(action); return; @@ -446,9 +562,9 @@ void SIMIX_execution_finish(smx_action_t action) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->smx_host->name); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host)); simcall->issuer->context->iwannadie = 1; - //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; case SIMIX_CANCELED: @@ -462,12 +578,12 @@ void SIMIX_execution_finish(smx_action_t action) } /* check if the host is down */ if (surf_workstation_model->extension. - workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) { + workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; } simcall->issuer->waiting_action = NULL; - simcall->host_execution_wait.result = action->state; + simcall_host_execution_wait__set__result(simcall, action->state); SIMIX_simcall_answer(simcall); } @@ -479,7 +595,7 @@ void SIMIX_post_host_execute(smx_action_t action) { if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure * for parallel tasks too */ - surf_workstation_model->extension.workstation.get_state(action->execution.host->host) == SURF_RESOURCE_OFF) { + surf_workstation_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) { /* If the host running the action failed, notice it so that the asking * process can be killed if it runs on that host itself */ action->state = SIMIX_FAILED; @@ -504,6 +620,10 @@ void SIMIX_post_host_execute(smx_action_t action) #ifdef HAVE_TRACING +void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action, + const char *category){ + SIMIX_set_category(action, category); +} void SIMIX_set_category(smx_action_t action, const char *category) { if (action->state != SIMIX_RUNNING) return; @@ -515,3 +635,11 @@ void SIMIX_set_category(smx_action_t action, const char *category) } #endif +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_host_get_storage_list(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_model->extension.workstation.get_storage_list(host); +}