return;
}
-Action *HostL07Model::executeParallelTask(int host_nb,
- sg_host_t*host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate)
+Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
+ double *flops_amount, double *bytes_amount,
+ double rate) {
+ return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
+}
+
+
+L07Action::L07Action(Model *model, int host_nb,
+ sg_host_t*host_list,
+ double *flops_amount,
+ double *bytes_amount,
+ double rate)
+ : CpuAction(model, 1, 0)
{
- L07Action *action = new L07Action(this, 1, 0);
unsigned int cpt;
int nb_link = 0;
int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
- action->p_edgeList->reserve(host_nb);
+ this->p_netcardList->reserve(host_nb);
for (int i = 0; i<host_nb; i++)
- action->p_edgeList->push_back(sg_host_edge(host_list[i]));
+ this->p_netcardList->push_back(host_list[i]->p_netcard);
/* Compute the number of affected resources... */
for (int i = 0; i < host_nb; i++) {
void *_link;
LinkL07 *link;
- routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j],
&route, &lat);
latency = MAX(latency, lat);
nb_used_host++;
XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
- action, host_nb, nb_link);
- action->m_suspended = 0; /* valgrind seems to want it despite the calloc... */
- action->p_computationAmount = flops_amount;
- action->p_communicationAmount = bytes_amount;
- action->m_latency = latency;
- action->m_rate = rate;
-
- action->p_variable = lmm_variable_new(p_maxminSystem, action, 1.0,
+ this, host_nb, nb_link);
+ this->p_computationAmount = flops_amount;
+ this->p_communicationAmount = bytes_amount;
+ this->m_latency = latency;
+ this->m_rate = rate;
+
+ this->p_variable = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
(rate > 0 ? rate : -1.0),
host_nb + nb_link);
- if (action->m_latency > 0)
- lmm_update_variable_weight(p_maxminSystem, action->getVariable(), 0.0);
+ if (this->m_latency > 0)
+ lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0);
for (int i = 0; i < host_nb; i++)
- lmm_expand(p_maxminSystem,
- sg_host_surfcpu(host_list[i])->getConstraint(),
- action->getVariable(), flops_amount[i]);
+ lmm_expand(model->getMaxminSystem(),
+ host_list[i]->p_cpu->getConstraint(),
+ this->getVariable(), flops_amount[i]);
for (int i = 0; i < host_nb; i++) {
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j],
&route, NULL);
xbt_dynar_foreach(route, cpt, _link) {
LinkL07 *link = static_cast<LinkL07*>(_link);
- lmm_expand_add(p_maxminSystem, link->getConstraint(),
- action->getVariable(),
+ lmm_expand_add(model->getMaxminSystem(), link->getConstraint(),
+ this->getVariable(),
bytes_amount[i * host_nb + j]);
}
}
}
if (nb_link + nb_used_host == 0) {
- action->setCost(1.0);
- action->setRemains(0.0);
+ this->setCost(1.0);
+ this->setRemains(0.0);
}
-
- return action;
}
-Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
sg_host_t*host_list = xbt_new0(sg_host_t, 2);
/* 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);
- CpuL07 *host = static_cast<CpuL07*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuL07 *host = static_cast<CpuL07*>(sg_host_by_name(elm)->p_cpu);
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);
- CpuL07 *host = static_cast<CpuL07*>(sg_host_surfcpu(sg_host_by_name(elm)));
+ CpuL07 *host = static_cast<CpuL07*>(sg_host_by_name(elm)->p_cpu);
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
: Cpu(model, host, speedPeakList, pstate,
core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, state_initial)
{
- xbt_assert(m_speedScale > 0, "Power has to be >0");
p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
if (speedTrace)
double lat_bound = -1.0;
int i, j;
- int hostNb = p_edgeList->size();
+ int hostNb = p_netcardList->size();
for (i = 0; i < hostNb; i++) {
for (j = 0; j < hostNb; j++) {
if (p_communicationAmount[i * hostNb + j] > 0) {
double lat = 0.0;
- routing_platf->getRouteAndLatency((*p_edgeList)[i], (*p_edgeList)[j],
+ routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j],
&route, &lat);
lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]);