-/* 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
* 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);
WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask_L07") {
if (!ptask_maxmin_system)
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<ResourcePtr>(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_pm;
+ delete surf_network_model;
+ ptask_host_count = 0;
+ if (ptask_maxmin_system) {
+ lmm_system_free(ptask_maxmin_system);
+ ptask_maxmin_system = NULL;
+ }
}
-double WorkstationL07Model::shareResources(double now)
+double WorkstationL07Model::shareResources(double /*now*/)
{
void *_action;
WorkstationL07ActionLmmPtr action;
- xbt_swag_t running_actions = this->p_runningActionSet;
+ xbt_swag_t running_actions = getRunningActionSet();
double min = this->shareResourcesMaxMin(running_actions,
ptask_maxmin_system,
bottleneck_solve);
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);
}
}
}
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;
- xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) {
+ xbt_swag_t actionSet = getRunningActionSet();
+ xbt_swag_foreach_safe(_action, _next_action, actionSet) {
action = dynamic_cast<WorkstationL07ActionLmmPtr>(static_cast<ActionPtr>(_action));
deltap = 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 */
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<WorkstationCLM03LmmPtr>(constraint_id)->p_stateCurrent == SURF_RESOURCE_OFF) {
+ if (static_cast<WorkstationLmmPtr>(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;
}
routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
static_cast<ResourcePtr>(
- surf_workstation_resource_priv(workstation_list[i])))->p_netElm,
+ workstation_list[i]))->p_netElm,
dynamic_cast<WorkstationL07Ptr>(
static_cast<ResourcePtr>(
- surf_workstation_resource_priv(workstation_list[j])))->p_netElm,
+ workstation_list[j]))->p_netElm,
&route,
&lat);
latency = MAX(latency, lat);
xbt_dynar_foreach(route, cpt, _link) {
link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
- xbt_dict_set(ptask_parallel_task_link_set, link->m_name, link, NULL);
+ xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL);
}
}
}
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;
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<CpuLmmPtr>(dynamic_cast<WorkstationL07Ptr>(
- static_cast<ResourcePtr>(
- surf_workstation_resource_priv(workstation_list[i])))->p_cpu)->p_constraint,
- action->p_variable, computation_amount[i]);
+ static_cast<ResourcePtr>(workstation_list[i]))->p_cpu)->constraint(),
+ action->getVariable(), computation_amount[i]);
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
continue;
routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
- static_cast<ResourcePtr>(
- surf_workstation_resource_priv(workstation_list[i])))->p_netElm,
+ static_cast<ResourcePtr>(workstation_list[i]))->p_netElm,
dynamic_cast<WorkstationL07Ptr>(
- static_cast<ResourcePtr>(
- surf_workstation_resource_priv(workstation_list[j])))->p_netElm,
+ static_cast<ResourcePtr>(workstation_list[j]))->p_netElm,
&route, NULL);
xbt_dynar_foreach(route, cpt, _link) {
link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
- lmm_expand_add(ptask_maxmin_system, link->p_constraint,
- action->p_variable,
+ lmm_expand_add(ptask_maxmin_system, link->constraint(),
+ 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<ActionPtr>(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<RoutingEdgePtr>(xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL)),
dynamic_cast<CpuPtr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL))));
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);
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<ResourcePtr>(cpu));
-
- cpu->p_stateCurrent = state_initial;
- if (state_trace)
- cpu->p_stateEvent =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(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<ResourcePtr>(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,
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<ResourcePtr>(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<ResourcePtr>(nw_link));
- if (state_trace)
- nw_link->p_stateEvent =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(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<ResourcePtr>(nw_link));
return nw_link;
/* 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 = (CpuL07Ptr) surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
+ CpuL07Ptr host = dynamic_cast<CpuL07Ptr>(
+ static_cast<ResourcePtr>(
+ 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);
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 = (CpuL07Ptr) surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
+ CpuL07Ptr host = dynamic_cast<CpuL07Ptr>(
+ static_cast<ResourcePtr>(
+ 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);
************/
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)
+ : Resource(model, name, props),
+ Workstation(NULL, netElm, cpu),
+ WorkstationLmm()
+{
+}
+
+double WorkstationL07::getPowerPeakAt(int /*pstate_index*/)
+{
+ XBT_DEBUG("[ws_get_power_peak_at] Not implemented for workstation_ptask_L07");
+ return 0.0;
+}
+
+int WorkstationL07::getNbPstates()
+{
+ XBT_DEBUG("[ws_get_nb_pstates] Not implemented for workstation_ptask_L07");
+ return 0.0;
+}
+
+void WorkstationL07::setPowerPeakAt(int /*pstate_index*/)
+{
+ XBT_DEBUG("[ws_set_power_peak_at] Not implemented for workstation_ptask_L07");
+}
+
+double WorkstationL07::getConsumedEnergy()
{
+ XBT_DEBUG("[ws_get_consumed_energy] Not implemented for workstation_ptask_L07");
+ 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)
+ : Resource(model, name, props)
+ , CpuLmm(lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale))
+{
+ 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<ResourcePtr>(this));
+ m_stateCurrent = state_initial;
+ if (state_trace)
+ p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(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)
+ : Resource(model, name, props)
+ , NetworkLinkLmm(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<ResourcePtr>(this));
+ m_stateCurrent = state_initial;
+ m_latCurrent = lat_initial;
+
+ if (lat_trace)
+ p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+
+ if (policy == SURF_LINK_FATPIPE)
+ lmm_constraint_shared(constraint());
}
-bool WorkstationL07::isUsed(){
- return lmm_constraint_used(ptask_maxmin_system, p_constraint);
+bool CpuL07::isUsed(){
+ return lmm_constraint_used(ptask_maxmin_system, constraint());
}
-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);
+bool LinkL07::isUsed(){
+ return lmm_constraint_used(ptask_maxmin_system, constraint());
+}
+
+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, constraint(), 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;
+ m_stateCurrent = SURF_RESOURCE_ON;
else
- p_stateCurrent = SURF_RESOURCE_OFF;
+ m_stateCurrent = SURF_RESOURCE_OFF;
if (tmgr_trace_event_free(event_type))
p_stateEvent = NULL;
} else {
}
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, constraint(), m_bwCurrent);
if (tmgr_trace_event_free(event_type))
p_bwEvent = NULL;
} else if (event_type == p_latEvent) {
lmm_element_t elem = NULL;
m_latCurrent = value;
- while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, p_constraint, &elem))) {
+ while ((var = lmm_get_var_from_cnst(ptask_maxmin_system, constraint(), &elem))) {
action = (WorkstationL07ActionLmmPtr) lmm_variable_id(var);
action->updateBound();
}
p_latEvent = NULL;
} else if (event_type == p_stateEvent) {
if (value > 0)
- p_stateCurrent = SURF_RESOURCE_ON;
+ m_stateCurrent = SURF_RESOURCE_ON;
else
- p_stateCurrent = SURF_RESOURCE_OFF;
+ m_stateCurrent = SURF_RESOURCE_OFF;
if (tmgr_trace_event_free(event_type))
p_stateEvent = NULL;
} else {
e_surf_resource_state_t WorkstationL07::getState()
{
- return p_cpu->p_stateCurrent;
+ return p_cpu->getState();
}
e_surf_resource_state_t CpuL07::getState()
{
- return p_stateCurrent;
+ return m_stateCurrent;
}
double CpuL07::getSpeed(double load)
communication_amount[0] = 0.0;
computation_amount[0] = size;
- return static_cast<WorkstationL07ModelPtr>(p_model)->executeParallelTask(1, workstation_list,
+ return static_cast<WorkstationL07ModelPtr>(getModel())->executeParallelTask(1, workstation_list,
computation_amount,
communication_amount, -1);
}
{
WorkstationL07ActionLmmPtr action = NULL;
- XBT_IN("(%s,%g)", m_name, duration);
+ XBT_IN("(%s,%g)", getName(), duration);
action = dynamic_cast<WorkstationL07ActionLmmPtr>(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;
bool LinkL07::isShared()
{
- return lmm_constraint_is_shared(p_constraint);
+ return lmm_constraint_is_shared(constraint());
}
/**********
free(p_workstationList);
free(p_communicationAmount);
free(p_computationAmount);
-#ifdef HAVE_TRACING
- xbt_free(p_category);
-#endif
}
void WorkstationL07ActionLmm::updateBound()
if (p_communicationAmount[i * m_workstationNb + j] > 0) {
double lat = 0.0;
routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
- static_cast<ResourcePtr>(
- surf_workstation_resource_priv(p_workstationList[i])))->p_netElm,
+ static_cast<ResourcePtr>(((void**)p_workstationList)[i]))->p_netElm,
dynamic_cast<WorkstationL07Ptr>(
- static_cast<ResourcePtr>(
- surf_workstation_resource_priv(p_workstationList[j])))->p_netElm,
+ static_cast<ResourcePtr>(((void**)p_workstationList)[j]))->p_netElm,
&route, &lat);
lat_current = MAX(lat_current, lat * p_communicationAmount[i * m_workstationNb + j]);
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));
}
}
m_refcount--;
if (!m_refcount) {
xbt_swag_remove(static_cast<ActionPtr>(this), p_stateSet);
- if (p_variable)
- lmm_variable_free(ptask_maxmin_system, p_variable);
+ if (getVariable())
+ lmm_variable_free(ptask_maxmin_system, getVariable());
delete this;
return 1;
}
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();
}
{
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();
return m_remains;
}
-
-
-
-
-
-
-
-
-static void ptask_finalize(void)
+/*FIXME:remove 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 **********/
/**************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**************************************/
/*** Resource Creation & Destruction **/
/**************************************/
static void ptask_parse_workstation_init(sg_platf_host_cbarg_t host)
{
+ double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double);
+ //cpu->power_peak = power_peak;
+ xbt_dynar_free(&(host->power_peak)); /* kill memory leak */
static_cast<WorkstationL07ModelPtr>(surf_workstation_model)->createResource(
host->id,
- host->power_peak,
+ power_peak,
host->power_scale,
host->power_trace,
host->initial_state,
static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
{
- static_cast<CpuL07ModelPtr>(surf_cpu_model)->createResource(
+ double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double);
+ static_cast<CpuL07ModelPtr>(surf_cpu_model_pm)->createResource(
host->id,
- host->power_peak,
+ power_peak,
host->power_scale,
host->power_trace,
host->initial_state,
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<ModelPtr>(surf_workstation_model);
xbt_dynar_push(model_list, &model);
+ xbt_dynar_push(model_list_invoke, &model);
}
