-/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "cpu_interface.hpp"
#include "surf_routing.hpp"
+#include "xbt/lib.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
surf_host_model = new HostL07Model();
Model *model = surf_host_model;
- xbt_dynar_push(model_list, &model);
- xbt_dynar_push(model_list_invoke, &model);
+ xbt_dynar_push(all_existing_models, &model);
}
if (!ptask_maxmin_system)
ptask_maxmin_system = lmm_system_new(1);
surf_host_model = NULL;
- surf_network_model = new NetworkL07Model();
- surf_cpu_model_pm = new CpuL07Model();
+ surf_network_model = new NetworkL07Model(this);
+ surf_cpu_model_pm = new CpuL07Model(this);
routing_model_create(surf_network_model->createLink("__loopback__",
498000000, NULL,
}
Action *HostL07Model::executeParallelTask(int host_nb,
- void **host_list,
+ sg_host_t*host_list,
double *flops_amount,
double *bytes_amount,
double rate)
action->p_edgeList->reserve(host_nb);
for (int i = 0; i<host_nb; i++)
- action->p_edgeList->push_back(static_cast<HostL07*>(host_list[i])->p_netElm);
+ action->p_edgeList->push_back(sg_host_edge(host_list[i]));
if (ptask_parallel_task_link_set == NULL)
ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
for (int i = 0; i < host_nb; i++)
lmm_expand(ptask_maxmin_system,
- static_cast<HostL07*>(host_list[i])->p_cpu->getConstraint(),
+ sg_host_surfcpu(host_list[i])->getConstraint(),
action->getVariable(), flops_amount[i]);
for (int i = 0; i < host_nb; i++) {
wk = new HostL07(this, name, NULL,
sg_host_edge(sg_host),
sg_host_surfcpu(sg_host));
-
+ surf_callback_emit(hostCreatedCallbacks, wk);
xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk);
return wk;
}
-Action *HostL07Model::communicate(Host *src, Host *dst,
+Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
double size, double rate)
{
- void **host_list = xbt_new0(void *, 2);
+ sg_host_t*host_list = xbt_new0(sg_host_t, 2);
double *flops_amount = xbt_new0(double, 2);
double *bytes_amount = xbt_new0(double, 4);
Action *res = NULL;
- host_list[0] = src;
- host_list[1] = dst;
+ host_list[0] = sg_host_by_name(src->getName());
+ host_list[1] = sg_host_by_name(dst->getName());
bytes_amount[1] = size;
- res = executeParallelTask(2, host_list,
+ res = p_hostModel->executeParallelTask(2, host_list,
flops_amount,
bytes_amount, rate);
xbt_dict_t cpu_properties)
{
double power_initial = xbt_dynar_get_as(powerPeak, pstate, double);
- xbt_dynar_free(&powerPeak); // kill memory leak
sg_host_t sg_host = sg_host_by_name(name);
xbt_assert(!surf_host_resource_priv(sg_host),
CpuL07 *cpu = new CpuL07(this, name, cpu_properties,
power_initial, power_scale, power_trace,
core, state_initial, state_trace);
-
- sg_host_surfcpu_set(sg_host, cpu);
-
+ sg_host_surfcpu_register(sg_host, cpu);
return cpu;
}
xbt_assert(!Link::byName(name),
"Link '%s' declared several times in the platform file.", name);
- return new LinkL07(this, name, properties,
+ Link* link = new LinkL07(this, name, properties,
bw_initial, bw_trace,
lat_initial, lat_trace,
state_initial, state_trace,
policy);
+ surf_callback_emit(networkLinkCreatedCallbacks, link);
+ return link;
}
void HostL07Model::addTraces()
double power_initial, double power_scale, tmgr_trace_t power_trace,
int core, 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),
- core, power_initial, power_scale)
+ core, power_initial, power_scale, state_initial)
{
xbt_assert(m_powerScale > 0, "Power has to be >0");
else
p_powerEvent = NULL;
- setState(state_initial);
if (state_trace)
p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
}
Action *HostL07::execute(double size)
{
- void **host_list = xbt_new0(void *, 1);
+ sg_host_t*host_list = xbt_new0(sg_host_t, 1);
double *flops_amount = xbt_new0(double, 1);
double *bytes_amount = xbt_new0(double, 1);
- host_list[0] = this;
- bytes_amount[0] = 0.0;
+ host_list[0] = sg_host_by_name(getName());
flops_amount[0] = size;
return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
{
m_refcount--;
if (!m_refcount) {
- if (actionHook::is_linked())
+ if (action_hook.is_linked())
p_stateSet->erase(p_stateSet->iterator_to(*this));
if (getVariable())
lmm_variable_free(ptask_maxmin_system, getVariable());