* \return A new SIMIX action
* */
smx_action_t SIMIX_action_communicate(smx_host_t sender,
- smx_host_t receiver, char *name,
+ smx_host_t receiver, const char *name,
double size, double rate)
{
+ smx_action_t act;
+ smx_simdata_action_t simdata;
+
/* check if the host is active */
- if (surf_workstation_resource->extension_public->
+ if (surf_workstation_model->extension_public->
get_state(sender->simdata->host) != SURF_CPU_ON) {
THROW1(network_error, 0,
"Host %s failed, you cannot call this function", sender->name);
}
- if (surf_workstation_resource->extension_public->
+ if (surf_workstation_model->extension_public->
get_state(receiver->simdata->host) != SURF_CPU_ON) {
THROW1(network_error, 0,
"Host %s failed, you cannot call this function",
}
/* alloc structures */
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
simdata->source = sender;
- simdata->surf_action = surf_workstation_resource->extension_public->
+ simdata->surf_action = surf_workstation_model->extension_public->
communicate(sender->simdata->host,
receiver->simdata->host, size, rate);
- surf_workstation_resource->common_public->action_set_data(simdata->
+ surf_workstation_model->common_public->action_set_data(simdata->
surf_action,
act);
smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
double amount)
{
+ smx_action_t act;
+ smx_simdata_action_t simdata;
+
/* check if the host is active */
- if (surf_workstation_resource->extension_public->
+ if (surf_workstation_model->extension_public->
get_state(host->simdata->host) != SURF_CPU_ON) {
THROW1(host_error, 0, "Host %s failed, you cannot call this function",
host->name);
}
/* alloc structures */
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->name = xbt_strdup(name);
/* set communication */
- simdata->surf_action = surf_workstation_resource->extension_public->
+ simdata->surf_action = surf_workstation_model->extension_public->
execute(host->simdata->host, amount);
- surf_workstation_resource->common_public->action_set_data(simdata->
+ surf_workstation_model->common_public->action_set_data(simdata->
surf_action,
act);
smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
{
char name[] = "sleep";
+ smx_simdata_action_t simdata;
+ smx_action_t act;
/* check if the host is active */
- if (surf_workstation_resource->extension_public->
+ if (surf_workstation_model->extension_public->
get_state(host->simdata->host) != SURF_CPU_ON) {
THROW1(host_error, 0, "Host %s failed, you cannot call this function",
host->name);
}
/* alloc structures */
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
simdata->source = host;
act->name = xbt_strdup(name);
- simdata->surf_action = surf_workstation_resource->extension_public->
+ simdata->surf_action = surf_workstation_model->extension_public->
sleep(host->simdata->host, duration);
- surf_workstation_resource->common_public->action_set_data(simdata->
+ surf_workstation_model->common_public->action_set_data(simdata->
surf_action,
act);
DEBUG1("Cancel action %p", action);
if (action->simdata->surf_action) {
- surf_workstation_resource->common_public->action_cancel(action->
+ surf_workstation_model->common_public->action_cancel(action->
simdata->
surf_action);
}
xbt_assert0((action != NULL)
&& (action->simdata != NULL), "Invalid parameter");
- surf_workstation_resource->common_public->
+ surf_workstation_model->common_public->
set_priority(action->simdata->surf_action, priority);
return;
}
xbt_fifo_free(action->cond_list);
if (action->simdata->surf_action)
- action->simdata->surf_action->resource_type->common_public->
+ action->simdata->surf_action->model_type->common_public->
action_free(action->simdata->surf_action);
xbt_free(action->simdata);
return action->simdata->surf_action->remains;
}
-smx_action_t SIMIX_action_parallel_execute(char *name, int workstation_nb,
- void **workstation_list,
+smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb,
+ smx_host_t *host_list,
double *computation_amount,
double *communication_amount,
double amount, double rate)
{
+ void **workstation_list = NULL;
+ smx_simdata_action_t simdata;
+ smx_action_t act;
+ int i;
/* alloc structures */
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->name = xbt_strdup(name);
- /* set communication */
+ /* set action */
+
+ workstation_list = xbt_new0(void *,host_nb);
+ for (i = 0; i < host_nb; i++)
+ workstation_list[i] = host_list[i]->simdata->host;
+
simdata->surf_action =
- surf_workstation_resource->extension_public->
- execute_parallel_task(workstation_nb, workstation_list,
+ surf_workstation_model->extension_public->
+ execute_parallel_task(host_nb, workstation_list,
computation_amount, communication_amount,
amount, rate);
- surf_workstation_resource->common_public->action_set_data(simdata->
- surf_action,
- act);
+ surf_workstation_model->common_public->action_set_data(simdata->
+ surf_action,
+ act);
return act;
}
e_surf_action_state_t SIMIX_action_get_state(smx_action_t action)
{
xbt_assert0((action != NULL), "Invalid parameter");
- return surf_workstation_resource->common_public->
+ return surf_workstation_model->common_public->
action_get_state(action->simdata->surf_action);
}