summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b43c07d)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4104
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
-/*Not implemented yet */
XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name,
XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name,
- int workstation_nb,
- void **workstation_list,
+ int host_nb,
+ smx_host_t *host_list,
double *computation_amount,
double *communication_amount,
double amount,
double *computation_amount,
double *communication_amount,
double amount,
return action->simdata->surf_action->remains;
}
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)
{
double *computation_amount,
double *communication_amount,
double amount, double rate)
{
+ void **workstation_list = NULL;
+ int i;
/* alloc structures */
smx_action_t act = xbt_new0(s_smx_action_t, 1);
/* alloc structures */
smx_action_t act = xbt_new0(s_smx_action_t, 1);
/* initialize them */
act->name = xbt_strdup(name);
/* 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_model->extension_public->
simdata->surf_action =
surf_workstation_model->extension_public->
- execute_parallel_task(workstation_nb, workstation_list,
+ execute_parallel_task(host_nb, workstation_list,
computation_amount, communication_amount,
amount, rate);
surf_workstation_model->common_public->action_set_data(simdata->
computation_amount, communication_amount,
amount, rate);
surf_workstation_model->common_public->action_set_data(simdata->