X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..a0213cc93b849f149294ee5ce99c147d957626a7:/src/surf/workstation_ptask_L07.cpp diff --git a/src/surf/workstation_ptask_L07.cpp b/src/surf/workstation_ptask_L07.cpp index 507d25e592..f44c1a1834 100644 --- a/src/surf/workstation_ptask_L07.cpp +++ b/src/surf/workstation_ptask_L07.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "workstation_ptask_L07.hpp" -#include "cpu.hpp" +#include "cpu_interface.hpp" #include "surf_routing.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation); @@ -19,18 +19,19 @@ WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask ptask_maxmin_system = lmm_system_new(1); surf_workstation_model = NULL; surf_network_model = new NetworkL07Model(); - surf_cpu_model = new CpuL07Model(); - routing_model_create(p_networkModel->createResource("__loopback__", + surf_cpu_model_pm = new CpuL07Model(); + routing_model_create(static_cast(surf_network_model->createResource("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); + SURF_LINK_FATPIPE, NULL))); + p_cpuModel = surf_cpu_model_pm; } WorkstationL07Model::~WorkstationL07Model() { xbt_dict_free(&ptask_parallel_task_link_set); - delete surf_cpu_model; + delete surf_cpu_model_pm; delete surf_network_model; ptask_host_count = 0; @@ -40,27 +41,27 @@ WorkstationL07Model::~WorkstationL07Model() { } } -double WorkstationL07Model::shareResources(double now) +double WorkstationL07Model::shareResources(double /*now*/) { - void *_action; - WorkstationL07ActionLmmPtr action; + WorkstationL07ActionPtr action; - xbt_swag_t running_actions = this->p_runningActionSet; + ActionListPtr running_actions = getRunningActionSet(); double min = this->shareResourcesMaxMin(running_actions, ptask_maxmin_system, bottleneck_solve); - xbt_swag_foreach(_action, running_actions) { - action = dynamic_cast(static_cast(_action)); + for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end()) + ; it != itend ; ++it) { + action = static_cast(&*it); if (action->m_latency > 0) { if (min < 0) { min = action->m_latency; XBT_DEBUG("Updating min (value) with %p (start %f): %f", action, - action->m_start, min); + action->getStartTime(), min); } else if (action->m_latency < min) { min = action->m_latency; XBT_DEBUG("Updating min (latency) with %p (start %f): %f", action, - action->m_start, min); + action->getStartTime(), min); } } } @@ -70,15 +71,17 @@ double WorkstationL07Model::shareResources(double now) return min; } -void WorkstationL07Model::updateActionsState(double now, double delta) +void WorkstationL07Model::updateActionsState(double /*now*/, double delta) { double deltap = 0.0; - void *_action, *_next_action; - WorkstationL07ActionLmmPtr action; + WorkstationL07ActionPtr action; - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); + ActionListPtr actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itNext = it, itend(actionSet->end()) + ; it != itend ; it=itNext) { + ++itNext; + action = static_cast(&*it); deltap = delta; if (action->m_latency > 0) { if (action->m_latency > deltap) { @@ -88,27 +91,27 @@ void WorkstationL07Model::updateActionsState(double now, double delta) double_update(&(deltap), action->m_latency); action->m_latency = 0.0; } - if ((action->m_latency == 0.0) && (action->m_suspended == 0)) { + if ((action->m_latency == 0.0) && (action->isSuspended() == 0)) { action->updateBound(); - lmm_update_variable_weight(ptask_maxmin_system, action->p_variable, 1.0); + lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 1.0); } } XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", - action, action->m_remains, lmm_variable_getvalue(action->p_variable) * delta); - double_update(&(action->m_remains), lmm_variable_getvalue(action->p_variable) * delta); + action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta); + action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&(action->m_maxDuration), delta); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); XBT_DEBUG("Action (%p) : remains (%g).", - action, action->m_remains); - if ((action->m_remains <= 0) && - (lmm_get_variable_weight(action->p_variable) > 0)) { - action->m_finish = surf_get_clock(); + action, action->getRemains()); + if ((action->getRemains() <= 0) && + (lmm_get_variable_weight(action->getVariable()) > 0)) { + action->finish(); action->setState(SURF_ACTION_DONE); - } else if ((action->m_maxDuration != NO_MAX_DURATION) && - (action->m_maxDuration <= 0)) { - action->m_finish = surf_get_clock(); + } else if ((action->getMaxDuration() != NO_MAX_DURATION) && + (action->getMaxDuration() <= 0)) { + action->finish(); action->setState(SURF_ACTION_DONE); } else { /* Need to check that none of the model has failed */ @@ -116,13 +119,13 @@ void WorkstationL07Model::updateActionsState(double now, double delta) int i = 0; void *constraint_id = NULL; - while ((cnst = lmm_get_cnst_from_var(ptask_maxmin_system, action->p_variable, + while ((cnst = lmm_get_cnst_from_var(ptask_maxmin_system, action->getVariable(), i++))) { constraint_id = lmm_constraint_id(cnst); - if (static_cast(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) { + if (static_cast(constraint_id)->getState() == SURF_RESOURCE_OFF) { XBT_DEBUG("Action (%p) Failed!!", action); - action->m_finish = surf_get_clock(); + action->finish(); action->setState(SURF_ACTION_FAILED); break; } @@ -139,7 +142,7 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, *communication_amount, double rate) { - WorkstationL07ActionLmmPtr action; + WorkstationL07ActionPtr action; int i, j; unsigned int cpt; int nb_link = 0; @@ -162,19 +165,15 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, void *_link; LinkL07Ptr link; - routing_platf->getRouteAndLatency(dynamic_cast( - static_cast( - workstation_list[i]))->p_netElm, - dynamic_cast( - static_cast( - workstation_list[j]))->p_netElm, + routing_platf->getRouteAndLatency(static_cast(workstation_list[i])->p_netElm, + static_cast(workstation_list[j])->p_netElm, &route, &lat); latency = MAX(latency, lat); xbt_dynar_foreach(route, cpt, _link) { - link = dynamic_cast(static_cast(_link)); - xbt_dict_set(ptask_parallel_task_link_set, link->m_name, link, NULL); + link = static_cast(_link); + xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); } } } @@ -187,13 +186,13 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, if (computation_amount[i] > 0) nb_host++; - action = new WorkstationL07ActionLmm(this, 1, 0); + action = new WorkstationL07Action(this, 1, 0); XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", action, workstation_nb, nb_link); 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; @@ -204,13 +203,12 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, workstation_nb + nb_link); if (action->m_latency > 0) - lmm_update_variable_weight(ptask_maxmin_system, action->p_variable, 0.0); + lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); for (i = 0; i < workstation_nb; i++) lmm_expand(ptask_maxmin_system, - static_cast(dynamic_cast( - static_cast(workstation_list[i]))->p_cpu)->p_constraint, - action->p_variable, computation_amount[i]); + static_cast(static_cast(workstation_list[i])->p_cpu)->getConstraint(), + action->getVariable(), computation_amount[i]); for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { @@ -221,51 +219,49 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb, if (communication_amount[i * workstation_nb + j] == 0.0) continue; - routing_platf->getRouteAndLatency(dynamic_cast( - static_cast(workstation_list[i]))->p_netElm, - dynamic_cast( - static_cast(workstation_list[j]))->p_netElm, + routing_platf->getRouteAndLatency(static_cast(workstation_list[i])->p_netElm, + static_cast(workstation_list[j])->p_netElm, &route, NULL); xbt_dynar_foreach(route, cpt, _link) { - link = dynamic_cast(static_cast(_link)); - lmm_expand_add(ptask_maxmin_system, link->p_constraint, - action->p_variable, + link = static_cast(_link); + lmm_expand_add(ptask_maxmin_system, link->getConstraint(), + action->getVariable(), communication_amount[i * workstation_nb + j]); } } } if (nb_link + nb_host == 0) { - action->m_cost = 1.0; - action->m_remains = 0.0; + action->setCost(1.0); + action->setRemains(0.0); } return static_cast(action); } -ResourcePtr WorkstationL07Model::createResource(const char *name, double power_scale, - double power_initial, - tmgr_trace_t power_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) +ResourcePtr WorkstationL07Model::createResource(const char *name, double /*power_scale*/, + double /*power_initial*/, + tmgr_trace_t /*power_trace*/, + e_surf_resource_state_t /*state_initial*/, + tmgr_trace_t /*state_trace*/, + xbt_dict_t /*cpu_properties*/) { WorkstationL07Ptr wk = NULL; xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), "Host '%s' declared several times in the platform file.", name); - wk = new WorkstationL07(this, name, cpu_properties, + wk = new WorkstationL07(this, name, NULL, static_cast(xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL)), - dynamic_cast(static_cast(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL)))); + static_cast(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL))); xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, static_cast(wk)); 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); @@ -284,7 +280,7 @@ ActionPtr WorkstationL07Model::communicate(WorkstationCLM03Ptr src, WorkstationC 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); @@ -298,36 +294,19 @@ ResourcePtr CpuL07Model::createResource(const char *name, double power_scale, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { - CpuL07Ptr cpu = NULL; xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), "Host '%s' declared several times in the platform file.", name); - cpu = new CpuL07(this, name, cpu_properties); - - cpu->p_power.scale = power_scale; - xbt_assert(cpu->p_power.scale > 0, "Power has to be >0"); - - cpu->m_powerCurrent = power_initial; - if (power_trace) - cpu->p_power.event = - tmgr_history_add_trace(history, power_trace, 0.0, 0, static_cast(cpu)); - - cpu->p_stateCurrent = state_initial; - if (state_trace) - cpu->p_stateEvent = - tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast(cpu)); - - cpu->p_constraint = - lmm_constraint_new(ptask_maxmin_system, cpu, - cpu->m_powerCurrent * cpu->p_power.scale); + CpuL07Ptr cpu = new CpuL07(this, name, cpu_properties, + power_scale, power_initial, power_trace,state_initial, state_trace); xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast(cpu)); return cpu;//FIXME:xbt_lib_get_elm_or_null(host_lib, name); } -ResourcePtr NetworkL07Model::createResource(const char *name, +NetworkLinkPtr NetworkL07Model::createResource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -335,33 +314,18 @@ ResourcePtr NetworkL07Model::createResource(const char *name, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) + e_surf_link_sharing_policy_t policy, + xbt_dict_t properties) { - LinkL07Ptr nw_link = new LinkL07(this, xbt_strdup(name), properties); xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), - "Link '%s' declared several times in the platform file.", - name); - - nw_link->m_bwCurrent = bw_initial; - if (bw_trace) - nw_link->p_bwEvent = - tmgr_history_add_trace(history, bw_trace, 0.0, 0, static_cast(nw_link)); - nw_link->p_stateCurrent = state_initial; - nw_link->m_latCurrent = lat_initial; - if (lat_trace) - nw_link->p_latEvent = - tmgr_history_add_trace(history, lat_trace, 0.0, 0, static_cast(nw_link)); - if (state_trace) - nw_link->p_stateEvent = - tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast(nw_link)); + "Link '%s' declared several times in the platform file.", + name); - nw_link->p_constraint = - lmm_constraint_new(ptask_maxmin_system, nw_link, - nw_link->m_bwCurrent); - - if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(nw_link->p_constraint); + LinkL07Ptr nw_link = new LinkL07(this, name, properties, + bw_initial, bw_trace, + lat_initial, lat_trace, + state_initial, state_trace, + policy); xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, static_cast(nw_link)); return nw_link; @@ -378,10 +342,7 @@ void WorkstationL07Model::addTraces() /* Connect traces relative to cpu */ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuL07Ptr host = dynamic_cast( - static_cast( - surf_cpu_resource_priv( - surf_cpu_resource_by_name(elm)))); + CpuL07Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -391,10 +352,7 @@ void WorkstationL07Model::addTraces() xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuL07Ptr host = dynamic_cast( - static_cast( - surf_cpu_resource_priv( - surf_cpu_resource_by_name(elm)))); + CpuL07Ptr host = static_cast(surf_cpu_resource_priv(surf_cpu_resource_by_name(elm))); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -405,7 +363,7 @@ void WorkstationL07Model::addTraces() /* Connect traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - LinkL07Ptr link = dynamic_cast(static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL))); + LinkL07Ptr link = static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -415,7 +373,7 @@ void WorkstationL07Model::addTraces() xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - LinkL07Ptr link = dynamic_cast(static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL))); + LinkL07Ptr link = static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -425,7 +383,7 @@ void WorkstationL07Model::addTraces() xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - LinkL07Ptr link = dynamic_cast(static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL))); + LinkL07Ptr link = static_cast(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -439,11 +397,11 @@ void WorkstationL07Model::addTraces() ************/ WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu) - : Resource(model, name, props), WorkstationCLM03Lmm(model, name, props, NULL, netElm, cpu) + : Workstation(model, name, props, NULL, netElm, cpu) { } -double WorkstationL07::getPowerPeakAt(int pstate_index) +double WorkstationL07::getPowerPeakAt(int /*pstate_index*/) { XBT_DEBUG("[ws_get_power_peak_at] Not implemented for workstation_ptask_L07"); return 0.0; @@ -455,7 +413,7 @@ int WorkstationL07::getNbPstates() return 0.0; } -void WorkstationL07::setPowerPeakAt(int pstate_index) +void WorkstationL07::setPowerPeakAt(int /*pstate_index*/) { XBT_DEBUG("[ws_set_power_peak_at] Not implemented for workstation_ptask_L07"); } @@ -466,36 +424,72 @@ double WorkstationL07::getConsumedEnergy() return 0.0; } -CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props) - : Resource(model, name, props), CpuLmm(model, name, props) { +CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props, + double power_scale, + double power_initial, tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, tmgr_trace_t state_trace) + : Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale), + 1, 0, 0) +{ + p_power.scale = power_scale; + xbt_assert(p_power.scale > 0, "Power has to be >0"); + + m_powerCurrent = power_initial; + if (power_trace) + p_power.event = tmgr_history_add_trace(history, power_trace, 0.0, 0, + static_cast(this)); + else + p_power.event = NULL; + setState(state_initial); + if (state_trace) + p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast(this)); } -LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props) - : Resource(model, name, props), NetworkCm02LinkLmm(model, name, props) { +LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy) + : NetworkLink(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, bw_initial), history, state_trace) +{ + m_bwCurrent = bw_initial; + if (bw_trace) + p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, static_cast(this)); + + setState(state_initial); + m_latCurrent = lat_initial; + if (lat_trace) + p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, static_cast(this)); + + if (policy == SURF_LINK_FATPIPE) + lmm_constraint_shared(getConstraint()); } bool CpuL07::isUsed(){ - return lmm_constraint_used(ptask_maxmin_system, p_constraint); + return lmm_constraint_used(ptask_maxmin_system, getConstraint()); } bool LinkL07::isUsed(){ - return lmm_constraint_used(ptask_maxmin_system, p_constraint); + return lmm_constraint_used(ptask_maxmin_system, getConstraint()); } -void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double date){ - XBT_DEBUG("Updating cpu %s (%p) with value %g", m_name, this, value); +void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double /*date*/){ + XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); if (event_type == p_power.event) { m_powerCurrent = value; - lmm_update_constraint_bound(ptask_maxmin_system, p_constraint, m_powerCurrent * p_power.scale); + lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_powerCurrent * p_power.scale); if (tmgr_trace_event_free(event_type)) p_power.event = NULL; } else if (event_type == p_stateEvent) { if (value > 0) - p_stateCurrent = SURF_RESOURCE_ON; + setState(SURF_RESOURCE_ON); else - p_stateCurrent = SURF_RESOURCE_OFF; + setState(SURF_RESOURCE_OFF); if (tmgr_trace_event_free(event_type)) p_stateEvent = NULL; } else { @@ -506,29 +500,29 @@ void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double dat } void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double date){ - XBT_DEBUG("Updating link %s (%p) with value=%f for date=%g", m_name, this, value, date); + XBT_DEBUG("Updating link %s (%p) with value=%f for date=%g", getName(), this, value, date); if (event_type == p_bwEvent) { m_bwCurrent = value; - lmm_update_constraint_bound(ptask_maxmin_system, p_constraint, m_bwCurrent); + lmm_update_constraint_bound(ptask_maxmin_system, getConstraint(), m_bwCurrent); if (tmgr_trace_event_free(event_type)) p_bwEvent = NULL; } else if (event_type == p_latEvent) { lmm_variable_t var = NULL; - WorkstationL07ActionLmmPtr action; + WorkstationL07ActionPtr action; lmm_element_t elem = NULL; m_latCurrent = value; - while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, p_constraint, &elem))) { - action = (WorkstationL07ActionLmmPtr) lmm_variable_id(var); + while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, getConstraint(), &elem))) { + action = (WorkstationL07ActionPtr) lmm_variable_id(var); action->updateBound(); } if (tmgr_trace_event_free(event_type)) p_latEvent = NULL; } else if (event_type == p_stateEvent) { if (value > 0) - p_stateCurrent = SURF_RESOURCE_ON; + setState(SURF_RESOURCE_ON); else - p_stateCurrent = SURF_RESOURCE_OFF; + setState(SURF_RESOURCE_OFF); if (tmgr_trace_event_free(event_type)) p_stateEvent = NULL; } else { @@ -540,12 +534,7 @@ void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double da e_surf_resource_state_t WorkstationL07::getState() { - return p_cpu->p_stateCurrent; -} - -e_surf_resource_state_t CpuL07::getState() -{ - return p_stateCurrent; + return p_cpu->getState(); } double CpuL07::getSpeed(double load) @@ -568,21 +557,21 @@ ActionPtr WorkstationL07::execute(double size) communication_amount[0] = 0.0; computation_amount[0] = size; - return static_cast(p_model)->executeParallelTask(1, workstation_list, + return static_cast(getModel())->executeParallelTask(1, workstation_list, computation_amount, communication_amount, -1); } ActionPtr WorkstationL07::sleep(double duration) { - WorkstationL07ActionLmmPtr action = NULL; + WorkstationL07ActionPtr action = NULL; - XBT_IN("(%s,%g)", m_name, duration); + XBT_IN("(%s,%g)", getName(), duration); - action = dynamic_cast(execute(1.0)); + action = static_cast(execute(1.0)); action->m_maxDuration = duration; action->m_suspended = 2; - lmm_update_variable_weight(ptask_maxmin_system, action->p_variable, 0.0); + lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); XBT_OUT(); return action; @@ -600,23 +589,20 @@ double LinkL07::getLatency() bool LinkL07::isShared() { - return lmm_constraint_is_shared(p_constraint); + return lmm_constraint_is_shared(getConstraint()); } /********** * Action * **********/ -WorkstationL07ActionLmm::~WorkstationL07ActionLmm(){ +WorkstationL07Action::~WorkstationL07Action(){ free(p_workstationList); free(p_communicationAmount); free(p_computationAmount); -#ifdef HAVE_TRACING - xbt_free(p_category); -#endif } -void WorkstationL07ActionLmm::updateBound() +void WorkstationL07Action::updateBound() { double lat_current = 0.0; double lat_bound = -1.0; @@ -628,10 +614,8 @@ void WorkstationL07ActionLmm::updateBound() if (p_communicationAmount[i * m_workstationNb + j] > 0) { double lat = 0.0; - routing_platf->getRouteAndLatency(dynamic_cast( - static_cast(((void**)p_workstationList)[i]))->p_netElm, - dynamic_cast( - static_cast(((void**)p_workstationList)[j]))->p_netElm, + routing_platf->getRouteAndLatency(static_cast(((void**)p_workstationList)[i])->p_netElm, + static_cast(((void**)p_workstationList)[j])->p_netElm, &route, &lat); lat_current = MAX(lat_current, lat * p_communicationAmount[i * m_workstationNb + j]); @@ -642,86 +626,79 @@ void WorkstationL07ActionLmm::updateBound() XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); if ((m_latency == 0.0) && (m_suspended == 0)) { if (m_rate < 0) - lmm_update_variable_bound(ptask_maxmin_system, p_variable, lat_bound); + lmm_update_variable_bound(ptask_maxmin_system, getVariable(), lat_bound); else - lmm_update_variable_bound(ptask_maxmin_system, p_variable, min(m_rate, lat_bound)); + lmm_update_variable_bound(ptask_maxmin_system, getVariable(), min(m_rate, lat_bound)); } } -int WorkstationL07ActionLmm::unref() +int WorkstationL07Action::unref() { m_refcount--; if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); - if (p_variable) - lmm_variable_free(ptask_maxmin_system, p_variable); + if (actionHook::is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); + if (getVariable()) + lmm_variable_free(ptask_maxmin_system, getVariable()); delete this; return 1; } return 0; } -void WorkstationL07ActionLmm::cancel() +void WorkstationL07Action::cancel() { setState(SURF_ACTION_FAILED); return; } -void WorkstationL07ActionLmm::suspend() +void WorkstationL07Action::suspend() { XBT_IN("(%p))", this); if (m_suspended != 2) { m_suspended = 1; - lmm_update_variable_weight(ptask_maxmin_system, p_variable, 0.0); + lmm_update_variable_weight(ptask_maxmin_system, getVariable(), 0.0); } XBT_OUT(); } -void WorkstationL07ActionLmm::resume() +void WorkstationL07Action::resume() { XBT_IN("(%p)", this); if (m_suspended != 2) { - lmm_update_variable_weight(ptask_maxmin_system, p_variable, 1.0); + lmm_update_variable_weight(ptask_maxmin_system, getVariable(), 1.0); m_suspended = 0; } XBT_OUT(); } -bool WorkstationL07ActionLmm::isSuspended() +bool WorkstationL07Action::isSuspended() { return m_suspended == 1; } -void WorkstationL07ActionLmm::setMaxDuration(double duration) +void WorkstationL07Action::setMaxDuration(double duration) { /* FIXME: should inherit */ XBT_IN("(%p,%g)", this, duration); m_maxDuration = duration; XBT_OUT(); } -void WorkstationL07ActionLmm::setPriority(double priority) +void WorkstationL07Action::setPriority(double priority) { /* FIXME: should inherit */ XBT_IN("(%p,%g)", this, priority); m_priority = priority; XBT_OUT(); } -double WorkstationL07ActionLmm::getRemains() +double WorkstationL07Action::getRemains() { XBT_IN("(%p)", this); XBT_OUT(); return m_remains; } - - - - - - - - -static void ptask_finalize(void) +/*FIXME:remove static void ptask_finalize(void) { xbt_dict_free(&ptask_parallel_task_link_set); @@ -736,27 +713,12 @@ static void ptask_finalize(void) lmm_system_free(ptask_maxmin_system); ptask_maxmin_system = NULL; } -} + }*/ /**************************************/ /******* Resource Private **********/ /**************************************/ - - - - - - - - - - - - - - - /**************************************/ /*** Resource Creation & Destruction **/ /**************************************/ @@ -779,7 +741,7 @@ static void ptask_parse_workstation_init(sg_platf_host_cbarg_t host) static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host) { double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double); - static_cast(surf_cpu_model)->createResource( + static_cast(surf_cpu_model_pm)->createResource( host->id, power_peak, host->power_scale, @@ -852,10 +814,11 @@ static void ptask_define_callbacks() void surf_workstation_model_init_ptask_L07(void) { XBT_INFO("surf_workstation_model_init_ptask_L07"); - xbt_assert(!surf_cpu_model, "CPU model type already defined"); + xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); xbt_assert(!surf_network_model, "network model type already defined"); ptask_define_callbacks(); surf_workstation_model = new WorkstationL07Model(); ModelPtr model = static_cast(surf_workstation_model); xbt_dynar_push(model_list, &model); + xbt_dynar_push(model_list_invoke, &model); }