-/* 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);
- routing_model_create(p_networkModel->createResource("__loopback__",
+ surf_workstation_model = NULL;
+ surf_network_model = new NetworkL07Model();
+ 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);
- surf_network_model = new NetworkL07Model();
- surf_cpu_model = new CpuL07Model();
+ 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;
return min;
}
-void WorkstationL07Model::updateActionsState(double now, double delta)
+void WorkstationL07Model::updateActionsState(double /*now*/, double delta)
{
double deltap = 0.0;
void *_action, *_next_action;
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);
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<NetworkCm02LinkPtr>(_link));
+ link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
xbt_dict_set(ptask_parallel_task_link_set, link->m_name, 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;
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,
+ static_cast<ResourcePtr>(workstation_list[i]))->p_cpu)->p_constraint,
action->p_variable, computation_amount[i]);
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
void *_link;
LinkL07Ptr link;
+
xbt_dynar_t route=NULL;
if (communication_amount[i * workstation_nb + j] == 0.0)
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 = static_cast<LinkL07Ptr>(static_cast<NetworkCm02LinkPtr>(_link));
+ link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
lmm_expand_add(ptask_maxmin_system, link->p_constraint,
action->p_variable,
communication_amount[i * workstation_nb + j]);
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);
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_link_sharing_policy_t
policy, xbt_dict_t properties)
{
- LinkL07Ptr nw_link = new LinkL07(this, xbt_strdup(name), properties);
+ LinkL07Ptr nw_link = new LinkL07(this, 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);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->p_constraint);
- xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, static_cast<NetworkCm02LinkPtr>(nw_link));
+ 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);
/* 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 = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+ LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(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);
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 = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+ LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(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);
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 = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+ LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(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);
************/
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) {
+ : Resource(model, name, props), CpuLmm() {
}
LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props)
- : Resource(model, name, props), NetworkCm02LinkLmm(model, name, props) {
+ : Resource(model, name, props), NetworkLinkLmm() {
+
+}
+bool CpuL07::isUsed(){
+ return lmm_constraint_used(ptask_maxmin_system, p_constraint);
}
-bool WorkstationL07::isUsed(){
+bool LinkL07::isUsed(){
return lmm_constraint_used(ptask_maxmin_system, p_constraint);
}
-void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double date){
+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);
if (event_type == p_power.event) {
m_powerCurrent = value;
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]);
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 **********/
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);
}
