xbt_assert(!surf_network_model, "network model type already defined");
// Define the callbacks to parse the XML
- sg_platf_host_add_cb(cpu_parse_init);
- sg_platf_host_add_cb(host_parse_init);
sg_platf_link_add_cb(ptask_netlink_parse_init);
sg_platf_postparse_add_cb(host_add_traces);
surf_host_model = new HostL07Model();
Model *model = surf_host_model;
xbt_dynar_push(all_existing_models, &model);
- xbt_dynar_push(model_list_invoke, &model);
}
return action;
}
-Host *HostL07Model::createHost(const char *name)
+Host *HostL07Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu)
{
- HostL07 *wk = NULL;
- sg_host_t sg_host = sg_host_by_name(name);
-
- xbt_assert(!surf_host_resource_priv(sg_host),
- "Host '%s' declared several times in the platform file.",
- name);
-
- wk = new HostL07(this, name, NULL,
- sg_host_edge(sg_host),
- sg_host_surfcpu(sg_host));
+ HostL07 *host = new HostL07(this, name, NULL, netElm, cpu);
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, wk);
+ surf_callback_emit(hostCreatedCallbacks, host);
+ xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host);
- return wk;
+ return host;
}
Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
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),
- "Host '%s' declared several times in the platform file.",
- name);
-
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 HostL07::getPowerPeakAt(int /*pstate_index*/)
-{
- THROW_UNIMPLEMENTED;
-}
-
-int HostL07::getNbPstates()
-{
- THROW_UNIMPLEMENTED;
-}
-
-void HostL07::setPstate(int /*pstate_index*/)
-{
- THROW_UNIMPLEMENTED;
-}
-
-int HostL07::getPstate()
-{
- THROW_UNIMPLEMENTED;
-}
-
-double HostL07::getConsumedEnergy()
-{
- THROW_UNIMPLEMENTED;
-}
-
CpuL07::CpuL07(CpuL07Model *model, const char* name, xbt_dict_t props,
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);
}
lmm_constraint_shared(getConstraint());
}
+Action *CpuL07::execute(double size)
+{
+ 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] = sg_host_by_name(getName());
+ flops_amount[0] = size;
+
+ return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
+ flops_amount,
+ bytes_amount, -1);
+}
+
+Action *CpuL07::sleep(double duration)
+{
+ L07Action *action = NULL;
+
+ XBT_IN("(%s,%g)", getName(), duration);
+
+ action = static_cast<L07Action*>(execute(1.0));
+ action->m_maxDuration = duration;
+ action->m_suspended = 2;
+ lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0);
+
+ XBT_OUT();
+ return action;
+}
+
bool CpuL07::isUsed(){
return lmm_constraint_used(ptask_maxmin_system, getConstraint());
}
return p_cpu->getState();
}
-Action *HostL07::execute(double size)
-{
- 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] = sg_host_by_name(getName());
- flops_amount[0] = size;
-
- return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
- flops_amount,
- bytes_amount, -1);
-}
-
-Action *HostL07::sleep(double duration)
-{
- L07Action *action = NULL;
-
- XBT_IN("(%s,%g)", getName(), duration);
-
- action = static_cast<L07Action*>(execute(1.0));
- action->m_maxDuration = duration;
- action->m_suspended = 2;
- lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0);
-
- XBT_OUT();
- return action;
-}
double LinkL07::getBandwidth()
{
}
-bool LinkL07::isShared()
+int LinkL07::sharingPolicy()
{
- return lmm_constraint_is_shared(getConstraint());
+ return lmm_constraint_sharing_policy(getConstraint());
}
/**********
