X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afb806d0615c22ac119575596b71691f4e2bc9d1..f159a7002798e65df6c90c3b9f774f48920aa41b:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 72a1aef240..a66b50869b 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -13,8 +13,10 @@ #include "cpu_interface.hpp" #include "surf_routing.hpp" #include "xbt/lib.h" +#include "src/surf/platform.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); +XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); /**************************************/ /*** Resource Creation & Destruction **/ @@ -28,13 +30,15 @@ static void ptask_netlink_parse_init(sg_platf_link_cbarg_t link) void surf_host_model_init_ptask_L07(void) { - XBT_INFO("Switching to the L07 model to handle parallel tasks."); + XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks."); xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); xbt_assert(!surf_network_model, "network model type already defined"); // Define the callbacks to parse the XML - sg_platf_link_add_cb(ptask_netlink_parse_init); - sg_platf_postparse_add_cb(host_add_traces); + simgrid::surf::on_link.connect(ptask_netlink_parse_init); + simgrid::surf::on_postparse.connect([](){ + surf_host_model->addTraces(); + }); surf_host_model = new simgrid::surf::HostL07Model(); xbt_dynar_push(all_existing_models, &surf_host_model); @@ -69,7 +73,8 @@ CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) } CpuL07Model::~CpuL07Model() { surf_cpu_model_pm = NULL; - p_maxminSystem = NULL; // Avoid multi-free + lmm_system_free(p_maxminSystem); + p_maxminSystem = NULL; } NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) : NetworkModel() @@ -197,77 +202,79 @@ L07Action::L07Action(Model *model, int host_nb, int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ double latency = 0.0; - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); this->p_netcardList->reserve(host_nb); for (int i = 0; ip_netcardList->push_back(host_list[i]->pimpl_netcard); /* Compute the number of affected resources... */ - for (int i = 0; i < host_nb; i++) { - for (int j = 0; j < host_nb; j++) { - xbt_dynar_t route=NULL; - - if (bytes_amount[i * host_nb + j] > 0) { - double lat=0.0; - unsigned int cpt; - void *_link; - LinkL07 *link; - - routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], - &route, &lat); - latency = MAX(latency, lat); - - xbt_dynar_foreach(route, cpt, _link) { - link = static_cast(_link); - xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); + if(bytes_amount != NULL) { + xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); + + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { + xbt_dynar_t route=NULL; + + if (bytes_amount[i * host_nb + j] > 0) { + double lat=0.0; + unsigned int cpt; + void *_link; + LinkL07 *link; + + routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], + &route, &lat); + latency = MAX(latency, lat); + + xbt_dynar_foreach(route, cpt, _link) { + link = static_cast(_link); + xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); + } } } } - } - nb_link = xbt_dict_length(ptask_parallel_task_link_set); - xbt_dict_free(&ptask_parallel_task_link_set); + nb_link = xbt_dict_length(ptask_parallel_task_link_set); + xbt_dict_free(&ptask_parallel_task_link_set); + } for (int i = 0; i < host_nb; i++) if (flops_amount[i] > 0) nb_used_host++; - XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", - this, host_nb, nb_link); + XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", 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); + (rate > 0 ? rate : -1.0), + host_nb + nb_link); 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(model->getMaxminSystem(), - host_list[i]->pimpl_cpu->getConstraint(), - this->getVariable(), flops_amount[i]); - - for (int i = 0; i < host_nb; i++) { - for (int j = 0; j < host_nb; j++) { - void *_link; - - xbt_dynar_t route=NULL; - if (bytes_amount[i * host_nb + j] == 0.0) - continue; - - routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], - &route, NULL); - - xbt_dynar_foreach(route, cpt, _link) { - LinkL07 *link = static_cast(_link); - lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), - this->getVariable(), - bytes_amount[i * host_nb + j]); + lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->getConstraint(), + this->getVariable(), flops_amount[i]); + + if(bytes_amount != NULL) { + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { + void *_link; + + xbt_dynar_t route=NULL; + if (bytes_amount[i * host_nb + j] == 0.0) + continue; + + routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], + &route, NULL); + + xbt_dynar_foreach(route, cpt, _link) { + LinkL07 *link = static_cast(_link); + lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), + this->getVariable(), bytes_amount[i * host_nb + j]); + } } } } @@ -290,14 +297,12 @@ Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst, host_list[1] = sg_host_by_name(dst->getName()); bytes_amount[1] = size; - res = p_hostModel->executeParallelTask(2, host_list, - flops_amount, - bytes_amount, rate); + res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); return res; } -Cpu *CpuL07Model::createCpu(simgrid::Host *host, xbt_dynar_t powerPeakList, +Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t powerPeakList, int pstate, double power_scale, tmgr_trace_t power_trace, int core, int initiallyOn, @@ -341,22 +346,22 @@ void HostL07Model::addTraces() /* 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(sg_host_by_name(elm)->pimpl_cpu); + Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu; - xbt_assert(host, "Host %s undefined", elm); + xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); + cpu->set_state_trace(trace); } - xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_host_speed, 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(sg_host_by_name(elm)->pimpl_cpu); + Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu; - xbt_assert(host, "Host %s undefined", elm); + xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_speedEvent = tmgr_history_add_trace(history, trace, 0.0, 0, host); + cpu->set_speed_trace(trace); } /* Connect traces relative to network */ @@ -367,27 +372,27 @@ void HostL07Model::addTraces() xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link); } - xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); LinkL07 *link = static_cast(Link::byName(elm)); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_bwEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, link); } - xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); LinkL07 *link = static_cast(Link::byName(elm)); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - link->p_latEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link); } } @@ -395,7 +400,7 @@ void HostL07Model::addTraces() * Resource * ************/ -CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host, +CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, int initiallyOn, tmgr_trace_t state_trace) @@ -405,12 +410,10 @@ CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host, p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale); if (speedTrace) - p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this); - else - p_speedEvent = NULL; + p_speedEvent = future_evt_set->add_trace(speedTrace, 0.0, this); if (state_trace) - p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this); + p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this); } CpuL07::~CpuL07() @@ -425,11 +428,11 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, int initiallyOn, tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy) - : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), history, state_trace) + : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), future_evt_set, state_trace) { m_bwCurrent = bw_initial; if (bw_trace) - p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, this); + p_bwEvent = future_evt_set->add_trace(bw_trace, 0.0, this); if (initiallyOn) turnOn(); @@ -438,38 +441,31 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, m_latCurrent = lat_initial; if (lat_trace) - p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, this); + p_latEvent = future_evt_set->add_trace(lat_trace, 0.0, this); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(getConstraint()); } -Action *CpuL07::execute(double size) +Action *CpuL07::execution_start(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] = getHost(); flops_amount[0] = size; - return static_cast(getModel()) - ->p_hostModel - ->executeParallelTask( 1, host_list, flops_amount, bytes_amount, -1); + return static_cast(getModel())->p_hostModel + ->executeParallelTask( 1, host_list, flops_amount, NULL, -1); } Action *CpuL07::sleep(double duration) { - L07Action *action = NULL; - - XBT_IN("(%s,%g)", getName(), duration); - - action = static_cast(execute(1.0)); + L07Action *action = static_cast(execution_start(1.0)); action->m_maxDuration = duration; action->m_suspended = 2; lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); - XBT_OUT(); return action; } @@ -500,49 +496,40 @@ bool LinkL07::isUsed(){ return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); } -void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double /*date*/){ +void CpuL07::updateState(tmgr_trace_iterator_t triggered, double value, double /*date*/){ XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); - if (event_type == p_speedEvent) { - m_speedScale = value; - onSpeedChange(); - if (tmgr_trace_event_free(event_type)) - p_speedEvent = NULL; - } else if (event_type == p_stateEvent) { + if (triggered == p_speedEvent) { + m_speedScale = value; + onSpeedChange(); + tmgr_trace_event_unref(&p_speedEvent); + } else if (triggered == p_stateEvent) { if (value > 0) turnOn(); else turnOff(); - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&p_stateEvent); } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event!\n"); } - return; } -void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double date) { +void LinkL07::updateState(tmgr_trace_iterator_t triggered, double value, double date) { XBT_DEBUG("Updating link %s (%p) with value=%f for date=%g", getName(), this, value, date); - if (event_type == p_bwEvent) { + if (triggered == p_bwEvent) { updateBandwidth(value, date); - if (tmgr_trace_event_free(event_type)) - p_bwEvent = NULL; - } else if (event_type == p_latEvent) { + tmgr_trace_event_unref(&p_bwEvent); + } else if (triggered == p_latEvent) { updateLatency(value, date); - if (tmgr_trace_event_free(event_type)) - p_latEvent = NULL; - } else if (event_type == p_stateEvent) { + tmgr_trace_event_unref(&p_latEvent); + } else if (triggered == p_stateEvent) { if (value > 0) turnOn(); else turnOff(); - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&p_stateEvent); } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event ! \n"); } - return; } double LinkL07::getBandwidth() @@ -586,16 +573,18 @@ void L07Action::updateBound() int hostNb = p_netcardList->size(); - for (i = 0; i < hostNb; i++) { - for (j = 0; j < hostNb; j++) { - xbt_dynar_t route=NULL; + if (p_communicationAmount != NULL) { + for (i = 0; i < hostNb; i++) { + for (j = 0; j < hostNb; j++) { + xbt_dynar_t route=NULL; - if (p_communicationAmount[i * hostNb + j] > 0) { - double lat = 0.0; - routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], - &route, &lat); + if (p_communicationAmount[i * hostNb + j] > 0) { + double lat = 0.0; + routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], + &route, &lat); - lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]); + lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]); + } } } } @@ -624,46 +613,5 @@ int L07Action::unref() return 0; } -void L07Action::suspend() -{ - XBT_IN("(%p))", this); - if (m_suspended != 2) { - m_suspended = 1; - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - } - XBT_OUT(); -} - -void L07Action::resume() -{ - XBT_IN("(%p)", this); - if (m_suspended != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 1.0); - m_suspended = 0; - } - XBT_OUT(); -} - -void L07Action::setMaxDuration(double duration) -{ /* FIXME: should inherit */ - XBT_IN("(%p,%g)", this, duration); - m_maxDuration = duration; - XBT_OUT(); -} - -void L07Action::setPriority(double priority) -{ /* FIXME: should inherit */ - XBT_IN("(%p,%g)", this, priority); - m_priority = priority; - XBT_OUT(); -} - -double L07Action::getRemains() -{ - XBT_IN("(%p)", this); - XBT_OUT(); - return m_remains; -} - } }