X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19759270d7d4b85df2dd599fe8936278d840780a..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/surf/cpu_ti.cpp?ds=sidebyside diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 6a1d618a5a..1cd22a7429 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -36,11 +36,11 @@ CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace) double time = 0; int i = 0; p_timePoints = (double*) xbt_malloc0(sizeof(double) * - (xbt_dynar_length(speedTrace->s_list.event_list) + 1)); + (xbt_dynar_length(speedTrace->event_list) + 1)); p_integral = (double*) xbt_malloc0(sizeof(double) * - (xbt_dynar_length(speedTrace->s_list.event_list) + 1)); - m_nbPoints = xbt_dynar_length(speedTrace->s_list.event_list) + 1; - xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) { + (xbt_dynar_length(speedTrace->event_list) + 1)); + m_nbPoints = xbt_dynar_length(speedTrace->event_list) + 1; + xbt_dynar_foreach(speedTrace->event_list, cpt, val) { p_timePoints[i] = time; p_integral[i] = integral; integral += val.delta * val.value; @@ -302,7 +302,7 @@ double CpuTiTgmr::getPowerScale(double a) reduced_a = a - floor(a / m_lastTime) * m_lastTime; point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0, p_trace->m_nbPoints - 1); - xbt_dynar_get_cpy(p_speedTrace->s_list.event_list, point, &val); + xbt_dynar_get_cpy(p_speedTrace->event_list, point, &val); return val.value; } @@ -330,8 +330,8 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) } /* only one point available, fixed trace */ - if (xbt_dynar_length(speedTrace->s_list.event_list) == 1) { - xbt_dynar_get_cpy(speedTrace->s_list.event_list, 0, &val); + if (xbt_dynar_length(speedTrace->event_list) == 1) { + xbt_dynar_get_cpy(speedTrace->event_list, 0, &val); m_type = TRACE_FIXED; m_value = val.value; return; @@ -341,7 +341,7 @@ CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value) p_speedTrace = speedTrace; /* count the total time of trace file */ - xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) { + xbt_dynar_foreach(speedTrace->event_list, cpt, val) { total_time += val.delta; } p_trace = new CpuTiTrace(speedTrace); @@ -385,17 +385,6 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high) } } -/************* - * CallBacks * - *************/ - -static void cpu_ti_define_callbacks() -{ - simgrid::surf::on_postparse.connect([]() { - surf_cpu_model_pm->addTraces(); - }); -} - /********* * Model * *********/ @@ -406,13 +395,14 @@ void surf_cpu_model_init_ti() xbt_assert(!surf_cpu_model_vm,"CPU model already initialized. This should not happen."); surf_cpu_model_pm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_pm); + surf_cpu_model_vm = new simgrid::surf::CpuTiModel(); + xbt_dynar_push(all_existing_models, &surf_cpu_model_vm); - cpu_ti_define_callbacks(); - simgrid::surf::Model *model_pm = static_cast(surf_cpu_model_pm); - simgrid::surf::Model *model_vm = static_cast(surf_cpu_model_vm); - xbt_dynar_push(all_existing_models, &model_pm); - xbt_dynar_push(all_existing_models, &model_vm); + simgrid::surf::on_postparse.connect([]() { + surf_cpu_model_pm->addTraces(); + }); } namespace simgrid { @@ -438,8 +428,8 @@ CpuTiModel::~CpuTiModel() } Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, - xbt_dynar_t speedPeak, - int pstate, + xbt_dynar_t speedPeak, + int pstate, double speedScale, tmgr_trace_t speedTrace, int core, @@ -450,7 +440,7 @@ Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0, "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?"); CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace, - core, initiallyOn, stateTrace); + core, initiallyOn, stateTrace); return cpu; } @@ -502,48 +492,14 @@ void CpuTiModel::addTraces() called = 1; /* connect all traces relative to hosts */ - 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); - CpuTi *cpu = static_cast(sg_host_by_name(elm)->pimpl_cpu); - - xbt_assert(cpu, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - if (cpu->p_stateEvent) { - XBT_DEBUG("Trace already configured for this CPU(%s), ignoring it", - elm); - continue; - } - XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm); - cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu); - } - - 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); CpuTi *cpu = static_cast(sg_host_by_name(elm)->pimpl_cpu); xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - XBT_DEBUG("Add speed trace: %s to CPU(%s)", trace_name, elm); - if (cpu->p_availTrace) - delete cpu->p_availTrace; - - cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_speedScale); - - /* add a fake trace event if periodicity == 0 */ - if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) { - s_tmgr_event_t val; - xbt_dynar_get_cpy(trace->s_list.event_list, - xbt_dynar_length(trace->s_list.event_list) - 1, &val); - if (val.delta == 0) { - tmgr_trace_t empty_trace; - empty_trace = tmgr_empty_trace_new(); - cpu->p_speedEvent = - tmgr_history_add_trace(history, empty_trace, - cpu->p_availTrace->m_lastTime, 0, cpu); - } - } + cpu->set_speed_trace(trace); } } @@ -567,16 +523,16 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, XBT_DEBUG("CPU create: peak=%f", m_speedPeak); if (stateTrace) - p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); + p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this); - if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) { - s_tmgr_event_t val; + if (speedTrace && xbt_dynar_length(speedTrace->event_list) > 1) { + s_tmgr_event_t val; // add a fake trace event if periodicity == 0 - xbt_dynar_get_cpy(speedTrace->s_list.event_list, - xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val); + xbt_dynar_get_cpy(speedTrace->event_list, + xbt_dynar_length(speedTrace->event_list) - 1, &val); if (val.delta == 0) { - tmgr_trace_t empty_trace = tmgr_empty_trace_new(); - p_speedEvent = tmgr_history_add_trace(history, empty_trace, p_availTrace->m_lastTime, 0, this); + p_speedEvent = + future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this); } } } @@ -587,6 +543,23 @@ CpuTi::~CpuTi() delete p_availTrace; delete p_actionSet; } +void CpuTi::set_speed_trace(tmgr_trace_t trace) +{ + if (p_availTrace) + delete p_availTrace; + + p_availTrace = new CpuTiTgmr(trace, m_speedScale); + + /* add a fake trace event if periodicity == 0 */ + if (trace && xbt_dynar_length(trace->event_list) > 1) { + s_tmgr_event_t val; + xbt_dynar_get_cpy(trace->event_list, + xbt_dynar_length(trace->event_list) - 1, &val); + if (val.delta == 0) { + p_speedEvent = future_evt_set->add_trace(tmgr_empty_trace_new(), 0.0, this); + } + } +} void CpuTi::updateState(tmgr_trace_iterator_t event_type, double value, double date) @@ -606,8 +579,8 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type, modified(true); speedTrace = p_availTrace->p_speedTrace; - xbt_dynar_get_cpy(speedTrace->s_list.event_list, - xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val); + xbt_dynar_get_cpy(speedTrace->event_list, + xbt_dynar_length(speedTrace->event_list) - 1, &val); /* free old trace */ delete p_availTrace; m_speedScale = val.value; @@ -617,8 +590,7 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type, p_availTrace = trace; - if (tmgr_trace_event_free(event_type)) - p_speedEvent = NULL; + tmgr_trace_event_unref(&p_speedEvent); } else if (event_type == p_stateEvent) { if (value > 0) { @@ -631,7 +603,7 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type, /* put all action running on cpu to failed */ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end()) ; it != itend ; ++it) { - action = &*it; + action = &*it; if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { @@ -646,14 +618,10 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type, } } } - 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 CpuTi::updateActionsFinishTime(double now) @@ -794,7 +762,7 @@ void CpuTi::updateRemainingAmount(double now) m_lastUpdate = now; } -CpuAction *CpuTi::execute(double size) +CpuAction *CpuTi::execution_start(double size) { XBT_IN("(%s,%g)", getName(), size); CpuTiAction *action = new CpuTiAction(static_cast(getModel()), size, isOff(), this); @@ -819,7 +787,7 @@ CpuAction *CpuTi::sleep(double duration) if (duration == NO_MAX_DURATION) { /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */ - action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); + action->getStateSet()->erase(action->getStateSet()->iterator_to(*action)); action->p_stateSet = static_cast(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked; action->getStateSet()->push_back(*action); } @@ -848,7 +816,7 @@ void CpuTi::modified(bool modified){ **********/ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, - CpuTi *cpu) + CpuTi *cpu) : CpuAction(model_, cost, failed) { p_cpu = cpu; @@ -871,8 +839,8 @@ int CpuTiAction::unref() { m_refcount--; if (!m_refcount) { - if (action_hook.is_linked()) - getStateSet()->erase(getStateSet()->iterator_to(*this)); + if (action_hook.is_linked()) + getStateSet()->erase(getStateSet()->iterator_to(*this)); /* remove from action_set */ if (action_ti_hook.is_linked()) p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));