#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
+#include "mc/mc_replay.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
/**
* \brief Internal function to create a SIMIX host.
* \param name name of the host to create
- * \param workstation the SURF workstation to encapsulate
* \param data some user data (may be NULL)
*/
-smx_host_t SIMIX_host_create(const char *name,
- void *workstation, void *data)
+smx_host_t SIMIX_host_create(const char *name, void *data)
{
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
s_smx_process_t proc;
return xbt_lib_get_elm_or_null(host_lib, name);
}
-void simcall_HANDLER_host_on(smx_simcall_t simcall, smx_host_t h)
-{
- SIMIX_host_on(h);
-}
-
/**
* \brief Start the host if it is off
*
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_host_resource_priv(h))==SURF_RESOURCE_OFF) {
+ surf_resource_set_state(surf_host_resource_priv(h), SURF_RESOURCE_ON);
unsigned int cpt;
smx_process_arg_t arg;
void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
{
- SIMIX_host_off(h, simcall->issuer);
+ SIMIX_host_off(h, simcall->issuer);
}
/**
xbt_assert((host != NULL), "Invalid parameters");
- 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);
+ if (surf_resource_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_ON) {
+ surf_resource_set_state(surf_host_resource_priv(h), SURF_RESOURCE_OFF);
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
smx_process_t process = NULL;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->smx_host), issuer->name);
+ XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->smx_host), issuer->name);
}
}
}
- /*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);*/
}
/**
return;
}
-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){
xbt_assert(((simix_global != NULL)
&& (host_lib != NULL)),
return SIMIX_host_get_name(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){
- xbt_assert((host != NULL), "Invalid parameters");
-
- return sg_host_name(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){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_resource_get_properties(surf_workstation_resource_priv(host));
+ return surf_resource_get_properties(surf_host_resource_priv(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){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_workstation_get_speed(host, 1.0);
+ return surf_host_get_speed(host, 1.0);
}
-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){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_workstation_get_core(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);
+ return surf_host_get_core(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 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){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_workstation_get_available_speed(host);
+ return surf_host_get_available_speed(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) {
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_workstation_get_current_power_peak(host);
+ return surf_host_get_current_power_peak(host);
}
-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) {
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_workstation_get_power_peak_at(host, pstate_index);
+ return surf_host_get_power_peak_at(host, pstate_index);
}
-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) {
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_workstation_get_nb_pstates(host);
+ return surf_host_get_nb_pstates(host);
}
-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_pstate(smx_host_t host, int pstate_index) {
+ surf_host_set_pstate(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_set_power_peak_at(host, pstate_index);
+int SIMIX_host_get_pstate(smx_host_t host) {
+ return surf_host_get_pstate(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) {
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_workstation_get_consumed_energy(host);
+ return surf_host_get_consumed_energy(host);
}
-
-int simcall_HANDLER_host_get_state(smx_simcall_t simcall, smx_host_t host){
- return SIMIX_host_get_state(host);
+double SIMIX_host_get_wattmin_at(smx_host_t host,int pstate) {
+ return surf_host_get_wattmin_at(host,pstate);
+}
+double SIMIX_host_get_wattmax_at(smx_host_t host,int pstate) {
+ return surf_host_get_wattmax_at(host,pstate);
}
-int SIMIX_host_get_state(smx_host_t host){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_resource_get_state(surf_workstation_resource_priv(host));
+int SIMIX_host_get_state(smx_host_t host){
+ return surf_resource_get_state(surf_host_resource_priv(host));
}
void _SIMIX_host_free_process_arg(void *data)
xbt_die("No function for simix_global->autorestart");
}
-smx_synchro_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);
-}
smx_synchro_t SIMIX_host_execute(const char *name,
- smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask){
+ smx_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = host;
-
-#ifdef HAVE_TRACING
synchro->category = NULL;
-#endif
/* set surf's action */
- if (!MC_is_active()) {
+ if (!MC_is_active() && !MC_record_replay_is_active()) {
- synchro->execution.surf_exec = surf_workstation_execute(host, computation_amount);
+ synchro->execution.surf_exec = surf_host_execute(host, flops_amount);
surf_action_set_data(synchro->execution.surf_exec, synchro);
surf_action_set_priority(synchro->execution.surf_exec, priority);
return synchro;
}
-smx_synchro_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 SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount,
- communication_amount, amount, rate);
-}
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
int host_nb, smx_host_t *host_list,
- double *computation_amount, double *communication_amount,
+ double *flops_amount, double *bytes_amount,
double amount, double rate){
- void **workstation_list = NULL;
+ void **surf_host_list = NULL;
int i;
/* alloc structures and initialize */
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
synchro->execution.host = NULL; /* FIXME: do we need the list of hosts? */
-
-#ifdef HAVE_TRACING
synchro->category = NULL;
-#endif
/* set surf's synchro */
- workstation_list = xbt_new0(void *, host_nb);
+ surf_host_list = xbt_new0(void *, host_nb);
for (i = 0; i < host_nb; i++)
- workstation_list[i] = surf_workstation_resource_priv(host_list[i]);
+ surf_host_list[i] = surf_host_resource_priv(host_list[i]);
/* FIXME: what happens if host_list contains VMs and PMs. If
* execute_parallel_task() does not change the state of the model, we can mix
* them. */
- surf_model_t ws_model = surf_resource_model(host_list[0], SURF_WKS_LEVEL);
+ surf_model_t ws_model = surf_resource_model(host_list[0], SURF_HOST_LEVEL);
for (i = 1; i < host_nb; i++) {
- surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_WKS_LEVEL);
+ surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_HOST_LEVEL);
if (ws_model_tmp != ws_model) {
XBT_CRITICAL("mixing VMs and PMs is not supported");
DIE_IMPOSSIBLE;
}
/* set surf's synchro */
- if (!MC_is_active()) {
+ if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec =
- surf_workstation_model_execute_parallel_task((surf_workstation_model_t)surf_workstation_model,
- host_nb, workstation_list, computation_amount, communication_amount, rate);
+ surf_host_model_execute_parallel_task((surf_host_model_t)surf_host_model,
+ host_nb, surf_host_list, flops_amount, bytes_amount, rate);
surf_action_set_data(synchro->execution.surf_exec, synchro);
}
return synchro;
}
-void simcall_HANDLER_host_execution_destroy(smx_simcall_t simcall, smx_synchro_t synchro){
- SIMIX_host_execution_destroy(synchro);
-}
void SIMIX_host_execution_destroy(smx_synchro_t synchro){
XBT_DEBUG("Destroy synchro %p", synchro);
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void simcall_HANDLER_host_execution_cancel(smx_simcall_t simcall, smx_synchro_t synchro){
- SIMIX_host_execution_cancel(synchro);
-}
void SIMIX_host_execution_cancel(smx_synchro_t synchro){
XBT_DEBUG("Cancel synchro %p", synchro);
surf_action_cancel(synchro->execution.surf_exec);
}
-double simcall_HANDLER_host_execution_get_remains(smx_simcall_t simcall, smx_synchro_t synchro){
- return SIMIX_host_execution_get_remains(synchro);
-}
double SIMIX_host_execution_get_remains(smx_synchro_t synchro){
double result = 0.0;
return result;
}
-e_smx_state_t simcall_HANDLER_host_execution_get_state(smx_simcall_t simcall, smx_synchro_t synchro){
- return SIMIX_host_execution_get_state(synchro);
-}
e_smx_state_t SIMIX_host_execution_get_state(smx_synchro_t synchro){
return synchro->state;
}
-void simcall_HANDLER_host_execution_set_priority(smx_simcall_t simcall, smx_synchro_t synchro,
- double priority){
- SIMIX_host_execution_set_priority(synchro, priority);
-}
void SIMIX_host_execution_set_priority(smx_synchro_t synchro, double priority){
if(synchro->execution.surf_exec)
surf_action_set_priority(synchro->execution.surf_exec, priority);
}
-void simcall_HANDLER_host_execution_set_bound(smx_simcall_t simcall, smx_synchro_t synchro,
- double bound){
- SIMIX_host_execution_set_bound(synchro, bound);
-}
void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound){
if(synchro->execution.surf_exec)
surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
}
-void simcall_HANDLER_host_execution_set_affinity(smx_simcall_t simcall,
- smx_synchro_t synchro, smx_host_t host, unsigned long mask){
- SIMIX_host_execution_set_affinity(synchro, host, mask);
-}
void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, smx_host_t host, unsigned long mask){
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
- if (MC_is_active()) {
+ if (MC_is_active() || MC_record_replay_is_active()) {
synchro->state = SIMIX_DONE;
SIMIX_execution_finish(synchro);
return;
(int)synchro->state);
}
/* check if the host is down */
- if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_host_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
{
if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
* for parallel tasks too */
- surf_resource_get_state(surf_workstation_resource_priv(synchro->execution.host)) == SURF_RESOURCE_OFF) {
+ surf_resource_get_state(surf_host_resource_priv(synchro->execution.host)) == SURF_RESOURCE_OFF) {
/* If the host running the synchro failed, notice it so that the asking
* process can be killed if it runs on that host itself */
synchro->state = SIMIX_FAILED;
}
-#ifdef HAVE_TRACING
-void simcall_HANDLER_set_category(smx_simcall_t simcall, smx_synchro_t synchro,
- const char *category){
- SIMIX_set_category(synchro, category);
-}
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
{
if (synchro->state != SIMIX_RUNNING) return;
surf_action_set_category(synchro->comm.surf_comm, category);
}
}
-#endif
/**
* \brief Function to get the parameters of the given the SIMIX host.
void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params)
{
/* jump to ws_get_params(). */
- surf_workstation_get_params(ind_vm, 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_host_get_params(ind_vm, params);
}
void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params)
{
/* jump to ws_set_params(). */
- surf_workstation_set_params(ind_vm, 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 simcall_HANDLER_host_get_mounted_storage_list(smx_simcall_t simcall, smx_host_t host){
- return SIMIX_host_get_mounted_storage_list(host);
+ surf_host_set_params(ind_vm, params);
}
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);
+ return surf_host_get_mounted_storage_list(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_attached_storage_list(host);
+ return surf_host_get_attached_storage_list(host);
}
