-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
i++))) {
constraint_id = lmm_constraint_id(cnst);
- if (static_cast<WorkstationCLM03LmmPtr>(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) {
+ if (static_cast<WorkstationLmmPtr>(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) {
XBT_DEBUG("Action (%p) Failed!!", action);
action->m_finish = surf_get_clock();
action->setState(SURF_ACTION_FAILED);
action->m_suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->m_workstationNb = workstation_nb;
- action->p_workstationList = (WorkstationCLM03Ptr *) workstation_list;
+ action->p_workstationList = (WorkstationPtr *) workstation_list;
action->p_computationAmount = computation_amount;
action->p_communicationAmount = communication_amount;
action->m_latency = latency;
tmgr_trace_t /*power_trace*/,
e_surf_resource_state_t /*state_initial*/,
tmgr_trace_t /*state_trace*/,
- xbt_dict_t cpu_properties)
+ xbt_dict_t /*cpu_properties*/)
{
WorkstationL07Ptr wk = NULL;
xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)),
return wk;//FIXME:xbt_lib_get_elm_or_null(host_lib, name);
}
-ActionPtr WorkstationL07Model::communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst,
+ActionPtr WorkstationL07Model::communicate(WorkstationPtr src, WorkstationPtr dst,
double size, double rate)
{
void **workstation_list = xbt_new0(void *, 2);
return res;
}
-xbt_dynar_t WorkstationL07Model::getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst)
+xbt_dynar_t WorkstationL07Model::getRoute(WorkstationPtr src, WorkstationPtr dst)
{
xbt_dynar_t route=NULL;
routing_platf->getRouteAndLatency(src->p_netElm, dst->p_netElm, &route, NULL);
WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu)
: Resource(model, name, props),
- WorkstationCLM03(model, name, props, NULL, netElm, cpu),
- WorkstationCLM03Lmm(model, name, props, NULL, netElm, cpu)
+ Workstation(NULL, netElm, cpu),
+ WorkstationLmm()
{
}
return m_remains;
}
-
-
-
-
-
-
-
-
-static void ptask_finalize(void)
+/*static void ptask_finalize(void)
{
xbt_dict_free(&ptask_parallel_task_link_set);
lmm_system_free(ptask_maxmin_system);
ptask_maxmin_system = NULL;
}
-}
+ }*/
/**************************************/
/******* Resource Private **********/