* CallBacks *
*************/
-static void workstation_new(sg_platf_host_cbarg_t host){
- reinterpret_cast<WorkstationCLM03ModelPtr>(surf_workstation_model)->createResource(host->id);
-}
-
/*********
* Model *
*********/
surf_network_model_init_LegrandVelho();
surf_workstation_model->p_cpuModel = surf_cpu_model_pm;
- ModelPtr model = static_cast<ModelPtr>(surf_workstation_model);
+ ModelPtr model = surf_workstation_model;
xbt_dynar_push(model_list, &model);
xbt_dynar_push(model_list_invoke, &model);
- sg_platf_host_add_cb(workstation_new);
+ sg_platf_host_add_cb(workstation_parse_init);
}
void surf_workstation_model_init_compound()
xbt_assert(surf_network_model, "No network model defined yet!");
surf_workstation_model = new WorkstationCLM03Model();
- ModelPtr model = static_cast<ModelPtr>(surf_workstation_model);
+ ModelPtr model = surf_workstation_model;
xbt_dynar_push(model_list, &model);
xbt_dynar_push(model_list_invoke, &model);
- sg_platf_host_add_cb(workstation_new);
+ sg_platf_host_add_cb(workstation_parse_init);
}
WorkstationCLM03Model::WorkstationCLM03Model()
WorkstationCLM03Model::~WorkstationCLM03Model()
{}
-void WorkstationCLM03Model::parseInit(sg_platf_host_cbarg_t host){
- createResource(host->id);
-}
-
-WorkstationPtr WorkstationCLM03Model::createResource(const char *name){
-
+WorkstationPtr WorkstationCLM03Model::createWorkstation(const char *name){
WorkstationPtr workstation = new WorkstationCLM03(surf_workstation_model, name, NULL,
(xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
(RoutingEdgePtr)xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL),
static_cast<CpuPtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL)));
XBT_DEBUG("Create workstation %s with %ld mounted disks", name, xbt_dynar_length(workstation->p_storage));
- xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, static_cast<ResourcePtr>(workstation));
+ xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
return workstation;
}
ActionPtr WorkstationCLM03Model::executeParallelTask(int workstation_nb,
void **workstation_list,
- double *computation_amount,
- double *communication_amount,
+ double *flops_amount,
+ double *bytes_amount,
double rate){
#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
+ ActionPtr action =NULL;
if ((workstation_nb == 1)
- && (cost_or_zero(communication_amount, 0) == 0.0))
- return ((WorkstationCLM03Ptr)workstation_list[0])->execute(computation_amount[0]);
- else if ((workstation_nb == 1)
- && (cost_or_zero(computation_amount, 0) == 0.0))
- return communicate((WorkstationCLM03Ptr)workstation_list[0], (WorkstationCLM03Ptr)workstation_list[0],communication_amount[0], rate);
- else if ((workstation_nb == 2)
- && (cost_or_zero(computation_amount, 0) == 0.0)
- && (cost_or_zero(computation_amount, 1) == 0.0)) {
+ && (cost_or_zero(bytes_amount, 0) == 0.0)){
+ action = ((WorkstationCLM03Ptr)workstation_list[0])->execute(flops_amount[0]);
+ } else if ((workstation_nb == 1)
+ && (cost_or_zero(flops_amount, 0) == 0.0)) {
+ action = communicate((WorkstationCLM03Ptr)workstation_list[0],
+ (WorkstationCLM03Ptr)workstation_list[0],bytes_amount[0], rate);
+ } else if ((workstation_nb == 2)
+ && (cost_or_zero(flops_amount, 0) == 0.0)
+ && (cost_or_zero(flops_amount, 1) == 0.0)) {
int i,nb = 0;
double value = 0.0;
for (i = 0; i < workstation_nb * workstation_nb; i++) {
- if (cost_or_zero(communication_amount, i) > 0.0) {
+ if (cost_or_zero(bytes_amount, i) > 0.0) {
nb++;
- value = cost_or_zero(communication_amount, i);
+ value = cost_or_zero(bytes_amount, i);
}
}
- if (nb == 1)
- return communicate((WorkstationCLM03Ptr)workstation_list[0], (WorkstationCLM03Ptr)workstation_list[1],value, rate);
- }
+ if (nb == 1){
+ action = communicate((WorkstationCLM03Ptr)workstation_list[0],
+ (WorkstationCLM03Ptr)workstation_list[1],value, rate);
+ }
+ } else
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
#undef cost_or_zero
-
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
- return NULL;
+ xbt_free((WorkstationCLM03Ptr)workstation_list);
+ return action;
}
ActionPtr WorkstationCLM03Model::communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate){