X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f8d73fe7373b7b04bc2727ff9ef61272dce9a9..83ff63f9a846dd01995a4bbb8979d2fa909ed34b:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index c9abf60f76..a9446205f5 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -1,79 +1,59 @@ #include "cpu_ti.hpp" -#include "solver.hpp" +//#include "solver.hpp" +#include "trace_mgr_private.h" +#include "xbt/heap.h" #ifndef SURF_MODEL_CPUTI_H_ #define SURF_MODEL_CPUTI_H_ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_tii, surf, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_cpu_tii, surfpp, "Logging specific to the SURF CPU TRACE INTEGRATION module"); -static std::vector - cpu_ti_running_action_set_that_does_not_need_being_checked; -static std::vector cpu_ti_modified_cpu; -static std::vector cpu_ti_action_heap; +static xbt_swag_t cpu_ti_running_action_set_that_does_not_need_being_checked; +static xbt_swag_t cpu_ti_modified_cpu; +static xbt_heap_t cpu_ti_action_heap; + +static CpuTiModelPtr surf_cpu_model = NULL; + +static void cpu_ti_action_update_index_heap(void *action, int i); /********* * Trace * *********/ -static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, - double a, double b); - - -static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, - double amount); -static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t - trace, double a, - double amount); - -static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace); -static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, - double a, double b); -static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t - trace, double a); -static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, - double a, double amount); -static int surf_cpu_ti_binary_search(double *array, double a, int low, - int high); - -static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace) +CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace) { - xbt_free(trace->time_points); - xbt_free(trace->integral); - xbt_free(trace); -} - -static void surf_cpu_ti_free_tmgr(surf_cpu_ti_tgmr_t trace) -{ - if (trace->trace) - surf_cpu_ti_free_trace(trace->trace); - xbt_free(trace); -} - -static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace) -{ - surf_cpu_ti_trace_t trace; s_tmgr_event_t val; unsigned int cpt; double integral = 0; double time = 0; int i = 0; - trace = xbt_new0(s_surf_cpu_ti_trace_t, 1); - trace->time_points = (double*) xbt_malloc0(sizeof(double) * + p_timePoints = (double*) xbt_malloc0(sizeof(double) * (xbt_dynar_length(power_trace->s_list.event_list) + 1)); - trace->integral = (double*) xbt_malloc0(sizeof(double) * + p_integral = (double*) xbt_malloc0(sizeof(double) * (xbt_dynar_length(power_trace->s_list.event_list) + 1)); - trace->nb_points = xbt_dynar_length(power_trace->s_list.event_list); + m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list); xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { - trace->time_points[i] = time; - trace->integral[i] = integral; + p_timePoints[i] = time; + p_integral[i] = integral; integral += val.delta * val.value; time += val.delta; i++; } - trace->time_points[i] = time; - trace->integral[i] = integral; - return trace; + p_timePoints[i] = time; + p_integral[i] = integral; +} + +CpuTiTrace::~CpuTiTrace() +{ + xbt_free(p_timePoints); + xbt_free(p_integral); +} + +CpuTiTgmr::~CpuTiTgmr() +{ + if (p_trace) + delete p_trace; } /** @@ -87,8 +67,7 @@ static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace) * \param b End of interval * \return the integrate value. -1 if an error occurs. */ -static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, - double a, double b) +double CpuTiTgmr::integrate(double a, double b) { double first_chunk; double middle_chunk; @@ -104,37 +83,34 @@ static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, if (a == b) return 0.0; - if (trace->type == TRACE_FIXED) { - return ((b - a) * trace->value); + if (m_type == TRACE_FIXED) { + return ((b - a) * m_value); } - if (ceil(a / trace->last_time) == a / trace->last_time) - a_index = 1 + (int) (ceil(a / trace->last_time)); + if (ceil(a / m_lastTime) == a / m_lastTime) + a_index = 1 + (int) (ceil(a / m_lastTime)); else - a_index = (int) (ceil(a / trace->last_time)); + a_index = (int) (ceil(a / m_lastTime)); - b_index = (int) (floor(b / trace->last_time)); + b_index = (int) (floor(b / m_lastTime)); if (a_index > b_index) { /* Same chunk */ - return surf_cpu_ti_integrate_trace_simple(trace->trace, - a - (a_index - - 1) * trace->last_time, - b - - (b_index) * - trace->last_time); + return p_trace->integrateSimple(a - (a_index - + 1) * m_lastTime, + b - + (b_index) * + m_lastTime); } - first_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace, - a - (a_index - - 1) * - trace->last_time, - trace->last_time); - middle_chunk = (b_index - a_index) * trace->total; - last_chunk = surf_cpu_ti_integrate_trace_simple(trace->trace, - 0.0, - b - - (b_index) * - trace->last_time); + first_chunk = p_trace->integrateSimple(a - (a_index - + 1) * + m_lastTime, + m_lastTime); + middle_chunk = (b_index - a_index) * m_total; + last_chunk = p_trace->integrateSimple(0.0, + b - + (b_index) * + m_lastTime); XBT_DEBUG("first_chunk=%.2f middle_chunk=%.2f last_chunk=%.2f\n", first_chunk, middle_chunk, last_chunk); @@ -151,12 +127,9 @@ static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace, * \param b Final point * \return Integral */ -static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, - double a, double b) +double CpuTiTrace::integrateSimple(double a, double b) { - return surf_cpu_ti_integrate_trace_simple_point(trace, - b) - - surf_cpu_ti_integrate_trace_simple_point(trace, a); + return integrateSimplePoint(b) - integrateSimplePoint(a); } /** @@ -165,29 +138,23 @@ static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace, * \param a point * \return Integral */ -static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t - trace, double a) +double CpuTiTrace::integrateSimplePoint(double a) { double integral = 0; int ind; double a_aux = a; - ind = - surf_cpu_ti_binary_search(trace->time_points, a, 0, - trace->nb_points - 1); - integral += trace->integral[ind]; + ind = binarySearch(p_timePoints, a, 0, m_nbPoints - 1); + integral += p_integral[ind]; XBT_DEBUG ("a %lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %lf", - a, ind, integral, trace->integral[ind + 1], trace->integral[ind], - trace->time_points[ind + 1], trace->time_points[ind]); - double_update(&a_aux, trace->time_points[ind]); + a, ind, integral, p_integral[ind + 1], p_integral[ind], + p_timePoints[ind + 1], p_timePoints[ind]); + double_update(&a_aux, p_timePoints[ind]); if (a_aux > 0) integral += - ((trace->integral[ind + 1] - - trace->integral[ind]) / (trace->time_points[ind + 1] - - trace->time_points[ind])) * (a - - trace-> - time_points - [ind]); + ((p_integral[ind + 1] - + p_integral[ind]) / (p_timePoints[ind + 1] - + p_timePoints[ind])) * (a - p_timePoints[ind]); XBT_DEBUG("Integral a %lf = %lf", a, integral); return integral; @@ -203,8 +170,7 @@ static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t * \param amount Amount to be executed * \return End time */ -static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, - double amount) +double CpuTiTgmr::solve(double a, double amount) { int quotient; double reduced_b; @@ -234,16 +200,16 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, return a; /* Is the trace fixed ? */ - if (trace->type == TRACE_FIXED) { - return (a + (amount / trace->value)); + if (m_type == TRACE_FIXED) { + return (a + (amount / m_value)); } - XBT_DEBUG("amount %lf total %lf", amount, trace->total); + XBT_DEBUG("amount %lf total %lf", amount, m_total); /* Reduce the problem to one where amount <= trace_total */ - quotient = (int) (floor(amount / trace->total)); - reduced_amount = (trace->total) * ((amount / trace->total) - - floor(amount / trace->total)); - reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time)); + quotient = (int) (floor(amount / m_total)); + reduced_amount = (m_total) * ((amount / m_total) - + floor(amount / m_total)); + reduced_a = a - (m_lastTime) * (int) (floor(a / m_lastTime)); XBT_DEBUG("Quotient: %d reduced_amount: %lf reduced_a: %lf", quotient, reduced_amount, reduced_a); @@ -253,13 +219,11 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, fprintf(stderr,"reduced_a = %.2f\n",reduced_a); fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount); */ - reduced_b = - surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a, - reduced_amount); + reduced_b = solveSomewhatSimple(reduced_a, reduced_amount); /* Re-map to the original b and amount */ - b = (trace->last_time) * (int) (floor(a / trace->last_time)) + - (quotient * trace->last_time) + reduced_b; + b = (m_lastTime) * (int) (floor(a / m_lastTime)) + + (quotient * m_lastTime) + reduced_b; return b; } @@ -270,26 +234,21 @@ static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a, * and a <=trace->last_time * */ -static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t - trace, double a, - double amount) +double CpuTiTgmr::solveSomewhatSimple(double a, double amount) { double amount_till_end; double b; XBT_DEBUG("Solve integral: [%.2f, amount=%.2f]", a, amount); - amount_till_end = - surf_cpu_ti_integrate_trace(trace, a, trace->last_time); + amount_till_end = integrate(a, m_lastTime); /* fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end); */ if (amount_till_end > amount) { - b = surf_cpu_ti_solve_trace_simple(trace->trace, a, amount); + b = p_trace->solveSimple(a, amount); } else { - b = trace->last_time + - surf_cpu_ti_solve_trace_simple(trace->trace, 0.0, - amount - amount_till_end); + b = m_lastTime + p_trace->solveSimple(0.0, amount - amount_till_end); } return b; } @@ -302,27 +261,45 @@ static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t * \param amount Amount of flops * \return The date when amount is available. */ -static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, - double a, double amount) +double CpuTiTrace::solveSimple(double a, double amount) { double integral_a; int ind; double time; - integral_a = surf_cpu_ti_integrate_trace_simple_point(trace, a); - ind = - surf_cpu_ti_binary_search(trace->integral, integral_a + amount, 0, - trace->nb_points - 1); - time = trace->time_points[ind]; + integral_a = integrateSimplePoint(a); + ind = binarySearch(p_integral, integral_a + amount, 0, m_nbPoints - 1); + time = p_timePoints[ind]; time += (integral_a + amount - - trace->integral[ind]) / ((trace->integral[ind + 1] - - trace->integral[ind]) / - (trace->time_points[ind + 1] - - trace->time_points[ind])); + p_integral[ind]) / ((p_integral[ind + 1] - + p_integral[ind]) / + (p_timePoints[ind + 1] - + p_timePoints[ind])); return time; } +/** +* \brief Auxiliary function to update the CPU power scale. +* +* This function uses the trace structure to return the power scale at the determined time a. +* \param trace Trace structure to search the updated power scale +* \param a Time +* \return CPU power scale +*/ +double CpuTiTgmr::getPowerScale(double a) +{ + double reduced_a; + int point; + s_tmgr_event_t val; + + 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_powerTrace->s_list.event_list, point, &val); + return val.value; +} + /** * \brief Creates a new integration trace from a tmgr_trace_t * @@ -331,47 +308,41 @@ static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace, * \param spacing Initial spacing * \return Integration trace structure */ -static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, - double value) +CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value) { - surf_cpu_ti_tgmr_t trace; double total_time = 0.0; s_tmgr_event_t val; unsigned int cpt; - trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1); /* no availability file, fixed trace */ if (!power_trace) { - trace->type = TRACE_FIXED; - trace->value = value; + m_type = TRACE_FIXED; + m_value = value; XBT_DEBUG("No availabily trace. Constant value = %lf", value); - return trace; + return; } /* only one point available, fixed trace */ if (xbt_dynar_length(power_trace->s_list.event_list) == 1) { xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val); - trace->type = TRACE_FIXED; - trace->value = val.value; - return trace; + m_type = TRACE_FIXED; + m_value = val.value; + return; } - trace->type = TRACE_DYNAMIC; - trace->power_trace = power_trace; + m_type = TRACE_DYNAMIC; + p_powerTrace = power_trace; /* count the total time of trace file */ xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) { total_time += val.delta; } - trace->trace = surf_cpu_ti_trace_new(power_trace); - trace->last_time = total_time; - trace->total = - surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time); + p_trace = new CpuTiTrace(power_trace); + m_lastTime = total_time; + m_total = p_trace->integrateSimple(0, total_time); XBT_DEBUG("Total integral %lf, last_time %lf ", - trace->total, trace->last_time); - - return trace; + m_total, m_lastTime); } /** @@ -383,8 +354,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, * \param high Upper bound to search in array * \return Index of point */ -static int surf_cpu_ti_binary_search(double *array, double a, int low, - int high) +int CpuTiTrace::binarySearch(double *array, double a, int low, int high) { xbt_assert(low < high, "Wrong parameters: low (%d) should be smaller than" " high (%d)", low, high); @@ -411,10 +381,65 @@ static int surf_cpu_ti_binary_search(double *array, double a, int low, CpuTiModel::CpuTiModel() : CpuModel("cpu_ti") { - + xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen."); + surf_cpu_model = this; + CpuTiAction action; + CpuTi cpu; + + cpu_ti_running_action_set_that_does_not_need_being_checked = + xbt_swag_new(xbt_swag_offset(action, p_stateHookup)); + + cpu_ti_modified_cpu = + xbt_swag_new(xbt_swag_offset(cpu, p_modifiedCpuHookup)); + + cpu_ti_action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(cpu_ti_action_heap, + cpu_ti_action_update_index_heap); + /* Define callbacks */ + //TODO sg_platf_host_add_cb(parse_cpu_ti_init); + //TODO sg_platf_postparse_add_cb(add_traces_cpu_ti); + + xbt_dynar_push(model_list, &surf_cpu_model); } -CpuTiPtr CpuTiModel::createResource(string name, +CpuTiModel::~CpuTiModel() +{ + void **cpu; + xbt_lib_cursor_t cursor; + char *key; + + xbt_lib_foreach(host_lib, cursor, key, cpu){ + if(cpu[SURF_CPU_LEVEL]) + { + CpuTiPtr CPU = (CpuTiPtr) cpu[SURF_CPU_LEVEL]; + xbt_swag_free(CPU->p_actionSet); + delete CPU->p_availTrace; + } + } + + delete surf_cpu_model; + surf_cpu_model = NULL; + + xbt_swag_free + (cpu_ti_running_action_set_that_does_not_need_being_checked); + xbt_swag_free(cpu_ti_modified_cpu); + cpu_ti_running_action_set_that_does_not_need_being_checked = NULL; + xbt_heap_free(cpu_ti_action_heap); +} + +void CpuTiModel::parseInit(sg_platf_host_cbarg_t host) +{ + createResource(host->id, + host->power_peak, + host->power_scale, + host->power_trace, + host->core_amount, + host->initial_state, + host->state_trace, + host->properties); +} + +CpuTiPtr CpuTiModel::createResource(const char *name, double powerPeak, double powerScale, tmgr_trace_t powerTrace, @@ -427,13 +452,13 @@ CpuTiPtr CpuTiModel::createResource(string name, s_tmgr_event_t val; CpuTiActionPtr cpuAction; xbt_assert(core==1,"Multi-core not handled with this model yet"); - /*TOREPAIR: xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), + xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)), "Host '%s' declared several times in the platform file", - name);*/ + name); CpuTiPtr cpu = new CpuTi(this, name, powerPeak, powerScale, powerTrace, core, stateInitial, stateTrace, cpuProperties); - xbt_lib_set(host_lib, name.c_str(), SURF_CPU_LEVEL, cpu); - return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name.c_str()); + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); + return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name); } CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed) @@ -441,71 +466,506 @@ CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed) return NULL;//new CpuTiAction(this, cost, failed); } -void CpuTi::printCpuTiModel() +double CpuTiModel::shareResources(double now) { - std::cout << getModel()->getName() << "<updateActionFinishDate(now); + } +/* get the min next event if heap not empty */ + if (xbt_heap_size(cpu_ti_action_heap) > 0) + min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now; + + XBT_DEBUG("Share resources, min next event date: %lf", min_action_duration); + + return min_action_duration; +} + +void CpuTiModel::updateActionsState(double now, double delta) +{ + while ((xbt_heap_size(cpu_ti_action_heap) > 0) + && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) { + CpuTiActionPtr action = (CpuTiActionPtr) xbt_heap_pop(cpu_ti_action_heap); + XBT_DEBUG("Action %p: finish", action); + action->m_finish = surf_get_clock(); + /* set the remains to 0 due to precision problems when updating the remaining amount */ + action->m_remains = 0; + action->setState(SURF_ACTION_DONE); + /* update remaining amout of all actions */ + action->p_cpu->updateRemainingAmount(surf_get_clock()); + } +} + +void CpuTiModel::addTraces() +{ + xbt_dict_cursor_t cursor = NULL; + char *trace_name, *elm; + + static int called = 0; + + if (called) + return; + 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); + CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)); + + 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) { + tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); + CpuTiPtr cpu = (CpuTiPtr) surf_cpu_resource_priv(surf_cpu_resource_by_name(elm)); + + xbt_assert(cpu, "Host %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); + + XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm); + if (cpu->p_availTrace) + delete cpu->p_availTrace; + + cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale); + + /* 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_powerEvent = + tmgr_history_add_trace(history, empty_trace, + cpu->p_availTrace->m_lastTime, 0, cpu); + } + } + } +} /************ * Resource * ************/ -CpuTi::CpuTi(CpuTiModelPtr model, string name, double powerPeak, +CpuTi::CpuTi(CpuTiModelPtr model, const char *name, double powerPeak, double powerScale, tmgr_trace_t powerTrace, int core, e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace, xbt_dict_t properties) : - Cpu(model, name, properties), m_powerPeak(powerPeak), m_powerScale(powerScale), - m_stateCurrent(stateInitial) { + Cpu(model, name, properties), p_stateCurrent(stateInitial) { + m_powerPeak = powerPeak; + m_powerScale = powerScale; + m_core = core; tmgr_trace_t empty_trace; s_tmgr_event_t val; xbt_assert(core==1,"Multi-core not handled with this model yet"); XBT_DEBUG("power scale %lf", powerScale); - m_availTrace = cpu_ti_parse_trace(powerTrace, powerScale); + p_availTrace = new CpuTiTgmr(powerTrace, powerScale); if (stateTrace) - /*TOREPAIR:m_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);*/ + p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this); if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) { // add a fake trace event if periodicity == 0 xbt_dynar_get_cpy(powerTrace->s_list.event_list, xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val); - /*TOREPAIR:if (val.delta == 0) { + if (val.delta == 0) { empty_trace = tmgr_empty_trace_new(); - m_powerEvent = + p_powerEvent = tmgr_history_add_trace(history, empty_trace, - m_availTrace->last_time, 0, this); - }*/ + p_availTrace->m_lastTime, 0, this); + } } }; -CpuTiModelPtr CpuTi::getModel() { +void CpuTi::updateState(tmgr_trace_event_t event_type, + double value, double date) +{ + void *_action; + CpuTiActionPtr action; + + surf_watched_hosts(); + + if (event_type == p_powerEvent) { + tmgr_trace_t power_trace; + CpuTiTgmrPtr trace; + s_tmgr_event_t val; + + XBT_DEBUG("Finish trace date: %lf value %lf date %lf", surf_get_clock(), + value, date); + /* update remaining of actions and put in modified cpu swag */ + updateRemainingAmount(date); + xbt_swag_insert(this, cpu_ti_modified_cpu); + + power_trace = p_availTrace->p_powerTrace; + xbt_dynar_get_cpy(power_trace->s_list.event_list, + xbt_dynar_length(power_trace->s_list.event_list) - 1, &val); + /* free old trace */ + delete p_availTrace; + m_powerScale = val.value; + + trace = new CpuTiTgmr(TRACE_FIXED, val.value); + XBT_DEBUG("value %lf", val.value); + + p_availTrace = trace; + + if (tmgr_trace_event_free(event_type)) + p_powerEvent = NULL; + + } else if (event_type == p_stateEvent) { + if (value > 0) + p_stateCurrent = SURF_RESOURCE_ON; + else { + p_stateCurrent = SURF_RESOURCE_OFF; + + /* put all action running on cpu to failed */ + xbt_swag_foreach(_action, p_actionSet) { + action = (CpuTiActionPtr) _action; + if (action->getState() == SURF_ACTION_RUNNING + || action->getState() == SURF_ACTION_READY + || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) { + action->m_finish = date; + action->setState(SURF_ACTION_FAILED); + if (action->m_indexHeap >= 0) { + CpuTiActionPtr heap_act = (CpuTiActionPtr) + xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap); + if (heap_act != action) + DIE_IMPOSSIBLE; + } + } + } + } + if (tmgr_trace_event_free(event_type)) + p_stateEvent = NULL; + } else { + XBT_CRITICAL("Unknown event ! \n"); + xbt_abort(); + } + + return; +} + +void CpuTi::updateActionFinishDate(double now) +{ + void *_action; + CpuTiActionPtr action; + double sum_priority = 0.0, total_area, min_finish = -1; + +/* update remaning amount of actions */ +updateRemainingAmount(now); + + xbt_swag_foreach(_action, p_actionSet) { + action = (CpuTiActionPtr) _action; + /* action not running, skip it */ + if (action->p_stateSet != + surf_cpu_model->p_runningActionSet) + continue; + + /* bogus priority, skip it */ + if (action->m_priority <= 0) + continue; + + /* action suspended, skip it */ + if (action->m_suspended != 0) + continue; + + sum_priority += 1.0 / action->m_priority; + } + m_sumPriority = sum_priority; + + xbt_swag_foreach(_action, p_actionSet) { + action = (CpuTiActionPtr) _action; + min_finish = -1; + /* action not running, skip it */ + if (action->p_stateSet != + surf_cpu_model->p_runningActionSet) + continue; + + /* verify if the action is really running on cpu */ + if (action->m_suspended == 0 && action->m_priority > 0) { + /* total area needed to finish the action. Used in trace integration */ + total_area = + (action->m_remains) * sum_priority * + action->m_priority; + + total_area /= m_powerPeak; + + action->m_finish = p_availTrace->solve(now, total_area); + /* verify which event will happen before (max_duration or finish time) */ + if (action->m_maxDuration != NO_MAX_DURATION && + action->m_start + action->m_maxDuration < action->m_finish) + min_finish = action->m_start + action->m_maxDuration; + else + min_finish = action->m_finish; + } else { + /* put the max duration time on heap */ + if (action->m_maxDuration != NO_MAX_DURATION) + min_finish = action->m_start + action->m_maxDuration; + } + /* add in action heap */ + XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap); + if (action->m_indexHeap >= 0) { + CpuTiActionPtr heap_act = (CpuTiActionPtr) + xbt_heap_remove(cpu_ti_action_heap, action->m_indexHeap); + if (heap_act != action) + DIE_IMPOSSIBLE; + } + if (min_finish != NO_MAX_DURATION) + xbt_heap_push(cpu_ti_action_heap, action, min_finish); + + XBT_DEBUG + ("Update finish time: Cpu(%s) Action: %p, Start Time: %lf Finish Time: %lf Max duration %lf", + m_name, action, action->m_start, + action->m_finish, + action->m_maxDuration); + } +/* remove from modified cpu */ + xbt_swag_remove(this, cpu_ti_modified_cpu); +} + +CpuTiModelPtr CpuTi::getModel() +{ return static_cast(p_model); }; -double CpuTi::getSpeed(double load) +bool CpuTi::isUsed() { - return load * m_powerPeak; + return xbt_swag_size(p_actionSet); } + + double CpuTi::getAvailableSpeed() { - return 0; + m_powerScale = p_availTrace->getPowerScale(surf_get_clock()); + return Cpu::getAvailableSpeed(); +} + +/** +* \brief Update the remaining amount of actions +* +* \param now Current time +*/ +void CpuTi::updateRemainingAmount(double now) +{ + double area_total; + void* _action; + CpuTiActionPtr action; + + /* already updated */ + if (m_lastUpdate >= now) + return; + +/* calcule the surface */ + area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak; + XBT_DEBUG("Flops total: %lf, Last update %lf", area_total, + m_lastUpdate); + + xbt_swag_foreach(_action, p_actionSet) { + action = (CpuTiActionPtr) _action; + /* action not running, skip it */ + if (action->p_stateSet != + getModel()->p_runningActionSet) + continue; + + /* bogus priority, skip it */ + if (action->m_priority <= 0) + continue; + + /* action suspended, skip it */ + if (action->m_suspended != 0) + continue; + + /* action don't need update */ + if (action->m_start >= now) + continue; + + /* skip action that are finishing now */ + if (action->m_finish >= 0 + && action->m_finish <= now) + continue; + + /* update remaining */ + double_update(&(action->m_remains), + area_total / (m_sumPriority * + action->m_priority)); + XBT_DEBUG("Update remaining action(%p) remaining %lf", action, + action->m_remains); + } + m_lastUpdate = now; +} + +CpuActionPtr CpuTi::execute(double size) +{ + XBT_IN("(%s,%g)", m_name, size); + CpuTiActionPtr action = new CpuTiAction(surf_cpu_model, size, p_stateCurrent != SURF_RESOURCE_ON); + + action->p_cpu = this; + action->m_indexHeap = -1; + + xbt_swag_insert(this, cpu_ti_modified_cpu); + + xbt_swag_insert(action, p_actionSet); + + action->m_suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ + + XBT_OUT(); + return action; +} + + +CpuActionPtr CpuTi::sleep(double duration) +{ + if (duration > 0) + duration = MAX(duration, MAXMIN_PRECISION); + + XBT_IN("(%s,%g)", m_name, duration); + CpuActionPtr action = execute(1.0); + action->m_maxDuration = duration; + action->m_suspended = 2; + if (duration == NO_MAX_DURATION) { + /* Move to the *end* of the corresponding action set. This convention + is used to speed up update_resource_state */ + xbt_swag_remove(action, action->p_stateSet); + action->p_stateSet = cpu_ti_running_action_set_that_does_not_need_being_checked; + xbt_swag_insert(action, action->p_stateSet); + } + XBT_OUT(); + return action; } +void CpuTi::printCpuTiModel() +{ + std::cout << getModel()->getName() << "<updateIndexHeap(i); +} +void CpuTiAction::updateIndexHeap(int i) +{ + m_indexHeap = i; +} -double CpuTiAction::getRemains() +void CpuTiAction::setState(e_surf_action_state_t state) { - return 0; + Action::setState(state); + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); } -double CpuTiAction::getStartTime() +int CpuTiAction::unref() { + m_refcount--; + if (!m_refcount) { + xbt_swag_remove(this, p_stateSet); + /* remove from action_set */ + xbt_swag_remove(this, ((CpuTiPtr)surf_cpu_resource_priv(p_cpu))->p_actionSet); + /* remove from heap */ + xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap); + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); + delete this; + return 1; + } return 0; } -double CpuTiAction::getFinishTime() +void CpuTiAction::cancel() { - return 0; + this->setState(SURF_ACTION_FAILED); + xbt_heap_remove(cpu_ti_action_heap, this->m_indexHeap); + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); + return; +} + +void CpuTiAction::recycle() +{ + DIE_IMPOSSIBLE; +} + +void CpuTiAction::suspend() +{ + XBT_IN("(%p)", this); + if (m_suspended != 2) { + m_suspended = 1; + xbt_heap_remove(cpu_ti_action_heap, m_indexHeap); + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); + } + XBT_OUT(); +} + +void CpuTiAction::resume() +{ + XBT_IN("(%p)", this); + if (m_suspended != 2) { + m_suspended = 0; + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); + } + XBT_OUT(); +} + +bool CpuTiAction::isSuspended() +{ + return m_suspended == 1; +} + +void CpuTiAction::setMaxDuration(double duration) +{ + double min_finish; + + XBT_IN("(%p,%g)", this, duration); + + m_maxDuration = duration; + + if (duration >= 0) + min_finish = (m_start + m_maxDuration) < m_finish ? + (m_start + m_maxDuration) : m_finish; + else + min_finish = m_finish; + +/* add in action heap */ + if (m_indexHeap >= 0) { + CpuTiActionPtr heap_act = (CpuTiActionPtr) + xbt_heap_remove(cpu_ti_action_heap, m_indexHeap); + if (heap_act != this) + DIE_IMPOSSIBLE; + } + xbt_heap_push(cpu_ti_action_heap, this, min_finish); + + XBT_OUT(); +} + +void CpuTiAction::setPriority(double priority) +{ + XBT_IN("(%p,%g)", this, priority); + m_priority = priority; + xbt_swag_insert(surf_cpu_resource_priv(p_cpu), cpu_ti_modified_cpu); + XBT_OUT(); +} + +double CpuTiAction::getRemains() +{ + XBT_IN("(%p)", this); + ((CpuTiPtr)p_cpu)->updateRemainingAmount(surf_get_clock()); + XBT_OUT(); + return m_remains; +} + +static void check() { + CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true); } #endif /* SURF_MODEL_CPUTI_H_ */