From 5d2455f1faff8bbf2e1cab9d5045bb712649b1c8 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Wed, 16 Nov 2011 11:31:38 +0100 Subject: [PATCH 1/1] Merge cpu.c and cpu_im.c --- buildtools/Cmake/DefinePackages.cmake | 1 - src/include/surf/surf.h | 9 + src/surf/cpu.c | 488 -------------------------- src/surf/cpu_im.c | 169 +++++++-- src/surf/surf.c | 2 +- 5 files changed, 141 insertions(+), 528 deletions(-) delete mode 100644 src/surf/cpu.c diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index b0e7ca8895..6a92e3a1ea 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -224,7 +224,6 @@ set(SURF_SRC src/surf/surf.c src/surf/surfxml_parse.c src/surf/surfxml_parseplatf.c - src/surf/cpu.c src/surf/network.c src/surf/network_im.c src/surf/network_constant.c diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index fe9b4f38d5..e50dd478e7 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -361,6 +361,15 @@ XBT_PUBLIC(void) surf_cpu_model_init_ti(void); */ XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(void); +/** \brief This function call the share resources function needed + * + */ +XBT_PUBLIC(double) generic_share_resources(double now); + +/** \brief This function call the update action state function needed + * + */ +XBT_PUBLIC(void) generic_update_actions_state(double now, double delta); /** \brief The list of all available cpu model models * \ingroup SURF_models */ diff --git a/src/surf/cpu.c b/src/surf/cpu.c deleted file mode 100644 index 443ae7eaa1..0000000000 --- a/src/surf/cpu.c +++ /dev/null @@ -1,488 +0,0 @@ -/* Copyright (c) 2004-2011. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "surf_private.h" -#include "surf/surf_resource.h" - - -typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t, - *surf_action_cpu_Cas01_t; - -typedef struct cpu_Cas01 { - s_surf_resource_t generic_resource; - double power_peak; - double power_scale; - tmgr_trace_event_t power_event; - int core; - e_surf_resource_state_t state_current; - tmgr_trace_event_t state_event; - lmm_constraint_t constraint; -} s_cpu_Cas01_t, *cpu_Cas01_t; - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, - "Logging specific to the SURF CPU module"); - - - -surf_model_t surf_cpu_model = NULL; -lmm_system_t cpu_maxmin_system = NULL; - - -static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = - NULL; - -static void* cpu_create_resource(const char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - - cpu_Cas01_t cpu = NULL; - xbt_assert(!surf_cpu_resource_by_name(name), - "Host '%s' declared several times in the platform file", - name); - cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t), - surf_cpu_model, name,cpu_properties); - cpu->power_peak = power_peak; - xbt_assert(cpu->power_peak > 0, "Power has to be >0"); - cpu->power_scale = power_scale; - cpu->core = core; - xbt_assert(core>0,"Invalid number of cores %d",core); - if (power_trace) - cpu->power_event = - tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); - - cpu->state_current = state_initial; - if (state_trace) - cpu->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); - - cpu->constraint = - lmm_constraint_new(cpu_maxmin_system, cpu, - cpu->core * cpu->power_scale * cpu->power_peak); - - xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - - return cpu; -} - - -static void parse_cpu_init(sg_platf_host_cbarg_t host) -{ - if(strcmp(host->coord,"")) xbt_die("Coordinates not implemented yet!"); - - cpu_create_resource(host->id, - host->power_peak, - host->power_scale, - host->power_trace, - host->core_amount, - host->initial_state, - host->state_trace, - host->properties); -} - -static void add_traces_cpu(void) -{ - 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 = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_Cas01_t host = surf_cpu_resource_by_name(elm); - - xbt_assert(host, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - host->state_event = - tmgr_history_add_trace(history, trace, 0.0, 0, host); - } - - xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { - tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_Cas01_t host = surf_cpu_resource_by_name(elm); - - xbt_assert(host, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - host->power_event = - tmgr_history_add_trace(history, trace, 0.0, 0, host); - } -} - -static void cpu_define_callbacks(void) -{ - sg_platf_host_add_cb(parse_cpu_init); - sg_platf_postparse_add_cb(add_traces_cpu); -} - -static int cpu_resource_used(void *resource_id) -{ - return lmm_constraint_used(cpu_maxmin_system, - ((cpu_Cas01_t) resource_id)->constraint); -} - -static int cpu_action_unref(surf_action_t action) -{ - action->refcount--; - if (!action->refcount) { - xbt_swag_remove(action, action->state_set); - if (((surf_action_cpu_Cas01_t) action)->variable) - lmm_variable_free(cpu_maxmin_system, - ((surf_action_cpu_Cas01_t) action)->variable); -#ifdef HAVE_TRACING - xbt_free(action->category); -#endif - surf_action_free(&action); - return 1; - } - return 0; -} - -static void cpu_action_cancel(surf_action_t action) -{ - surf_action_state_set(action, SURF_ACTION_FAILED); - return; -} - -static void cpu_action_state_set(surf_action_t action, - e_surf_action_state_t state) -{ -/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ -/* if(((surf_action_cpu_Cas01_t)action)->variable) { */ -/* lmm_variable_disable(cpu_maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); */ -/* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */ -/* } */ - - surf_action_state_set(action, state); - return; -} - -static double cpu_share_resources(double now) -{ - s_surf_action_cpu_Cas01_t action; - return generic_maxmin_share_resources(surf_cpu_model-> - states.running_action_set, - xbt_swag_offset(action, variable), - cpu_maxmin_system, lmm_solve); -} - -static void cpu_update_actions_state(double now, double delta) -{ - surf_action_cpu_Cas01_t action = NULL; - surf_action_cpu_Cas01_t next_action = NULL; - xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; - - xbt_swag_foreach_safe(action, next_action, running_actions) { -#ifdef HAVE_TRACING - if (TRACE_is_enabled()) { - cpu_Cas01_t x = - lmm_constraint_id(lmm_get_cnst_from_var - (cpu_maxmin_system, action->variable, 0)); - - TRACE_surf_host_set_utilization(x->generic_resource.name, - action->generic_action.data, - (surf_action_t) action, - lmm_variable_getvalue - (action->variable), now - delta, - delta); - TRACE_last_timestamp_to_dump = now-delta; - } -#endif - double_update(&(action->generic_action.remains), - lmm_variable_getvalue(action->variable) * delta); - if (action->generic_action.max_duration != NO_MAX_DURATION) - double_update(&(action->generic_action.max_duration), delta); - if ((action->generic_action.remains <= 0) && - (lmm_get_variable_weight(action->variable) > 0)) { - action->generic_action.finish = surf_get_clock(); - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && - (action->generic_action.max_duration <= 0)) { - action->generic_action.finish = surf_get_clock(); - cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); - } - } - - return; -} - -static void cpu_update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value, double date) -{ - cpu_Cas01_t cpu = id; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - if (event_type == cpu->power_event) { - cpu->power_scale = value; - lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint, - cpu->core * cpu->power_scale * cpu->power_peak); -#ifdef HAVE_TRACING - TRACE_surf_host_set_power(date, cpu->generic_resource.name, - cpu->core * cpu->power_scale * cpu->power_peak); -#endif - while ((var = lmm_get_var_from_cnst - (cpu_maxmin_system, cpu->constraint, &elem))) { - surf_action_cpu_Cas01_t action = lmm_variable_id(var); - lmm_update_variable_bound(cpu_maxmin_system, action->variable, - cpu->power_scale * cpu->power_peak); - } - if (tmgr_trace_event_free(event_type)) - cpu->power_event = NULL; - } else if (event_type == cpu->state_event) { - if (value > 0) - cpu->state_current = SURF_RESOURCE_ON; - else { - lmm_constraint_t cnst = cpu->constraint; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - cpu->state_current = SURF_RESOURCE_OFF; - - while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { - surf_action_t action = lmm_variable_id(var); - - if (surf_action_state_get(action) == SURF_ACTION_RUNNING || - surf_action_state_get(action) == SURF_ACTION_READY || - surf_action_state_get(action) == - SURF_ACTION_NOT_IN_THE_SYSTEM) { - action->finish = date; - cpu_action_state_set(action, SURF_ACTION_FAILED); - } - } - } - if (tmgr_trace_event_free(event_type)) - cpu->state_event = NULL; - } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); - } - - return; -} - -static surf_action_t cpu_execute(void *cpu, double size) -{ - surf_action_cpu_Cas01_t action = NULL; - cpu_Cas01_t CPU = cpu; - - XBT_IN("(%s,%g)", surf_resource_name(CPU), size); - action = - surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, - surf_cpu_model, - CPU->state_current != SURF_RESOURCE_ON); - - action->suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - - action->variable = lmm_variable_new(cpu_maxmin_system, action, - action->generic_action.priority, - CPU->power_scale * CPU->power_peak, 1); - lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0); - XBT_OUT(); - return (surf_action_t) action; -} - -static surf_action_t cpu_action_sleep(void *cpu, double duration) -{ - surf_action_cpu_Cas01_t action = NULL; - - if (duration > 0) - duration = MAX(duration, MAXMIN_PRECISION); - - XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); - action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0); - action->generic_action.max_duration = duration; - action->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, ((surf_action_t) action)->state_set); - ((surf_action_t) action)->state_set = - cpu_running_action_set_that_does_not_need_being_checked; - xbt_swag_insert(action, ((surf_action_t) action)->state_set); - } - - lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0); - XBT_OUT(); - return (surf_action_t) action; -} - -static void cpu_action_suspend(surf_action_t action) -{ - XBT_IN("(%p)", action); - if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_cpu_Cas01_t) - action)->variable, 0.0); - ((surf_action_cpu_Cas01_t) action)->suspended = 1; - } - XBT_OUT(); -} - -static void cpu_action_resume(surf_action_t action) -{ - XBT_IN("(%p)", action); - if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_cpu_Cas01_t) - action)->variable, action->priority); - ((surf_action_cpu_Cas01_t) action)->suspended = 0; - } - XBT_OUT(); -} - -static int cpu_action_is_suspended(surf_action_t action) -{ - return (((surf_action_cpu_Cas01_t) action)->suspended == 1); -} - -static void cpu_action_set_max_duration(surf_action_t action, - double duration) -{ - XBT_IN("(%p,%g)", action, duration); - action->max_duration = duration; - XBT_OUT(); -} - -static void cpu_action_set_priority(surf_action_t action, double priority) -{ - XBT_IN("(%p,%g)", action, priority); - action->priority = priority; - lmm_update_variable_weight(cpu_maxmin_system, - ((surf_action_cpu_Cas01_t) action)->variable, - priority); - - XBT_OUT(); -} - -#ifdef HAVE_TRACING -static void cpu_action_set_category(surf_action_t action, const char *category) -{ - XBT_IN("(%p,%s)", action, category); - action->category = xbt_strdup (category); - XBT_OUT(); -} -#endif - -static double cpu_action_get_remains(surf_action_t action) -{ - XBT_IN("(%p)", action); - return action->remains; - XBT_OUT(); -} - -static e_surf_resource_state_t cpu_get_state(void *cpu) -{ - return ((cpu_Cas01_t) cpu)->state_current; -} - -static double cpu_get_speed(void *cpu, double load) -{ - return load * (((cpu_Cas01_t) cpu)->power_peak); -} - -static double cpu_get_available_speed(void *cpu) -{ - /* number between 0 and 1 */ - return ((cpu_Cas01_t) cpu)->power_scale; -} - - -static void cpu_finalize(void) -{ - lmm_system_free(cpu_maxmin_system); - cpu_maxmin_system = NULL; - - surf_model_exit(surf_cpu_model); - surf_cpu_model = NULL; - - xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked); - cpu_running_action_set_that_does_not_need_being_checked = NULL; -} - -static void surf_cpu_model_init_internal(void) -{ - s_surf_action_t action; - - surf_cpu_model = surf_model_init(); - - cpu_running_action_set_that_does_not_need_being_checked = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); - - surf_cpu_model->name = "CPU"; - - surf_cpu_model->action_unref = cpu_action_unref; - surf_cpu_model->action_cancel = cpu_action_cancel; - surf_cpu_model->action_state_set = cpu_action_state_set; - - surf_cpu_model->model_private->resource_used = cpu_resource_used; - surf_cpu_model->model_private->share_resources = cpu_share_resources; - surf_cpu_model->model_private->update_actions_state = - cpu_update_actions_state; - surf_cpu_model->model_private->update_resource_state = - cpu_update_resource_state; - surf_cpu_model->model_private->finalize = cpu_finalize; - - surf_cpu_model->suspend = cpu_action_suspend; - surf_cpu_model->resume = cpu_action_resume; - surf_cpu_model->is_suspended = cpu_action_is_suspended; - surf_cpu_model->set_max_duration = cpu_action_set_max_duration; - surf_cpu_model->set_priority = cpu_action_set_priority; -#ifdef HAVE_TRACING - surf_cpu_model->set_category = cpu_action_set_category; -#endif - surf_cpu_model->get_remains = cpu_action_get_remains; - - surf_cpu_model->extension.cpu.execute = cpu_execute; - surf_cpu_model->extension.cpu.sleep = cpu_action_sleep; - - surf_cpu_model->extension.cpu.get_state = cpu_get_state; - surf_cpu_model->extension.cpu.get_speed = cpu_get_speed; - surf_cpu_model->extension.cpu.get_available_speed = - cpu_get_available_speed; - surf_cpu_model->extension.cpu.create_resource = cpu_create_resource; - surf_cpu_model->extension.cpu.add_traces = add_traces_cpu; - - if (!cpu_maxmin_system) - cpu_maxmin_system = lmm_system_new(); -} - -/*********************************************************************/ -/* Basic sharing model for CPU: that is where all this started... ;) */ -/*********************************************************************/ -/* @InProceedings{casanova01simgrid, */ -/* author = "H. Casanova", */ -/* booktitle = "Proceedings of the IEEE Symposium on Cluster Computing */ -/* and the Grid (CCGrid'01)", */ -/* publisher = "IEEE Computer Society", */ -/* title = "Simgrid: {A} Toolkit for the Simulation of Application */ -/* Scheduling", */ -/* year = "2001", */ -/* month = may, */ -/* note = "Available at */ -/* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */ -/* } */ -void surf_cpu_model_init_Cas01() -{ - if (surf_cpu_model) - return; - surf_cpu_model_init_internal(); - cpu_define_callbacks(); - xbt_dynar_push(model_list, &surf_cpu_model); -} diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index 0c29222db7..f7bf71f33b 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -7,6 +7,8 @@ #include "surf_private.h" #include "surf/surf_resource.h" +surf_model_t surf_cpu_model = NULL; +lmm_system_t cpu_maxmin_system = NULL; #undef GENERIC_LMM_ACTION #undef GENERIC_ACTION @@ -39,7 +41,6 @@ typedef struct cpu_Cas01_im { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_im, surf, "Logging specific to the SURF CPU IMPROVED module"); - lmm_system_t cpu_im_maxmin_system = NULL; static xbt_swag_t cpu_im_modified_cpu = NULL; static xbt_heap_t cpu_im_action_heap = NULL; @@ -68,11 +69,12 @@ static void* cpu_im_create_resource(const char *name, double power_peak, cpu->power_peak = power_peak; xbt_assert(cpu->power_peak > 0, "Power has to be >0"); cpu->power_scale = power_scale; + cpu->core = core; + xbt_assert(core>0,"Invalid number of cores %d",core); + if (power_trace) cpu->power_event = tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); - cpu->core = core; - xbt_assert(core>0,"Invalid number of cores %d",core); cpu->state_current = state_initial; if (state_trace) @@ -84,7 +86,8 @@ static void* cpu_im_create_resource(const char *name, double power_peak, cpu->core * cpu->power_scale * cpu->power_peak); xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); - cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup)); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup)); return cpu; } @@ -155,12 +158,14 @@ static int cpu_im_action_unref(surf_action_t action) if (((surf_action_lmm_t) action)->variable) lmm_variable_free(cpu_im_maxmin_system, ((surf_action_lmm_t) action)->variable); + if(!strcmp(surf_cpu_model->name,"CPU_IM")){ /* remove from heap */ xbt_heap_remove(cpu_im_action_heap, ((surf_action_cpu_Cas01_im_t) action)->index_heap); xbt_swag_remove(action, ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + } #ifdef HAVE_TRACING xbt_free(action->category); #endif @@ -173,10 +178,12 @@ static int cpu_im_action_unref(surf_action_t action) static void cpu_im_action_cancel(surf_action_t action) { surf_action_state_set(action, SURF_ACTION_FAILED); + if(!strcmp(surf_cpu_model->name,"CPU_IM")){ xbt_heap_remove(cpu_im_action_heap, ((surf_action_cpu_Cas01_im_t) action)->index_heap); xbt_swag_remove(action, ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set); + } return; } @@ -299,7 +306,6 @@ static double cpu_im_share_resources(double now) static void cpu_im_update_actions_state(double now, double delta) { surf_action_cpu_Cas01_im_t action; - while ((xbt_heap_size(cpu_im_action_heap) > 0) && (double_equals(xbt_heap_maxkey(cpu_im_action_heap), now))) { action = xbt_heap_pop(cpu_im_action_heap); @@ -310,7 +316,7 @@ static void cpu_im_update_actions_state(double now, double delta) if (TRACE_is_enabled()) { cpu_Cas01_im_t cpu = ((cpu_Cas01_im_t)(action->cpu)); TRACE_surf_host_set_utilization(cpu->generic_resource.name, - action->generic_lmm_action.generic_action.data, + GENERIC_LMM_ACTION(action).generic_action.data, (surf_action_t) action, lmm_variable_getvalue (GENERIC_LMM_ACTION(action).variable), cpu->last_update, @@ -369,10 +375,11 @@ static void cpu_im_update_resource_state(void *id, while ((var = lmm_get_var_from_cnst (cpu_im_maxmin_system, cpu->constraint, &elem))) { surf_action_cpu_Cas01_im_t action = lmm_variable_id(var); - lmm_update_variable_bound(cpu_im_maxmin_system, action->generic_lmm_action.variable, + lmm_update_variable_bound(cpu_im_maxmin_system, GENERIC_LMM_ACTION(action).variable, cpu->power_scale * cpu->power_peak); } - xbt_swag_insert(cpu, cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + xbt_swag_insert(cpu, cpu_im_modified_cpu); if (tmgr_trace_event_free(event_type)) cpu->power_event = NULL; } else if (event_type == cpu->state_event) { @@ -425,10 +432,12 @@ static surf_action_t cpu_im_execute(void *cpu, double size) GENERIC_LMM_ACTION(action).variable = lmm_variable_new(cpu_im_maxmin_system, action, GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1); - action->index_heap = -1; - action->cpu = CPU; - xbt_swag_insert(CPU, cpu_im_modified_cpu); - xbt_swag_insert(action, CPU->action_set); + if(!strcmp(surf_cpu_model->name,"CPU_IM")){ + action->index_heap = -1; + action->cpu = CPU; + xbt_swag_insert(CPU, cpu_im_modified_cpu); + xbt_swag_insert(action, CPU->action_set); + } lmm_expand(cpu_im_maxmin_system, CPU->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); XBT_OUT(); @@ -457,7 +466,8 @@ static surf_action_t cpu_im_action_sleep(void *cpu, double duration) lmm_update_variable_weight(cpu_im_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0.0); - xbt_swag_insert(cpu, cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + xbt_swag_insert(cpu, cpu_im_modified_cpu); XBT_OUT(); return (surf_action_t) action; } @@ -470,9 +480,11 @@ static void cpu_im_action_suspend(surf_action_t action) ((surf_action_lmm_t) action)->variable, 0.0); ((surf_action_lmm_t) action)->suspended = 1; - xbt_heap_remove(cpu_im_action_heap, - ((surf_action_cpu_Cas01_im_t) action)->index_heap); - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")){ + xbt_heap_remove(cpu_im_action_heap, + ((surf_action_cpu_Cas01_im_t) action)->index_heap); + xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + } } XBT_OUT(); } @@ -486,7 +498,8 @@ static void cpu_im_action_resume(surf_action_t action) ((surf_action_lmm_t) action)->variable, action->priority); ((surf_action_lmm_t) action)->suspended = 0; - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); } XBT_OUT(); } @@ -503,7 +516,8 @@ static void cpu_im_action_set_max_duration(surf_action_t action, action->max_duration = duration; /* insert cpu in modified_cpu set to notice the max duration change */ - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); XBT_OUT(); } @@ -516,7 +530,8 @@ static void cpu_im_action_set_priority(surf_action_t action, ((surf_action_lmm_t) action)->variable, priority); - xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu); XBT_OUT(); } @@ -534,7 +549,8 @@ static double cpu_im_action_get_remains(surf_action_t action) { XBT_IN("(%p)", action); /* update remains before return it */ - cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock()); + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock()); return action->remains; XBT_OUT(); } @@ -567,11 +583,11 @@ static void cpu_im_finalize(void) char *key; xbt_lib_foreach(host_lib, cursor, key, cpu){ - if(cpu[SURF_CPU_LEVEL]) - { - cpu_Cas01_im_t CPU = cpu[SURF_CPU_LEVEL]; - xbt_swag_free(CPU->action_set); - } + if(cpu[SURF_CPU_LEVEL]) + { + cpu_Cas01_im_t CPU = cpu[SURF_CPU_LEVEL]; + xbt_swag_free(CPU->action_set); + } } lmm_system_free(cpu_im_maxmin_system); @@ -583,11 +599,11 @@ static void cpu_im_finalize(void) xbt_swag_free (cpu_im_running_action_set_that_does_not_need_being_checked); cpu_im_running_action_set_that_does_not_need_being_checked = NULL; - xbt_heap_free(cpu_im_action_heap); - xbt_swag_free(cpu_im_modified_cpu); + if(cpu_im_action_heap) xbt_heap_free(cpu_im_action_heap); + if(cpu_im_modified_cpu) xbt_swag_free(cpu_im_modified_cpu); } -static void surf_cpu_im_model_init_internal(void) +static void surf_cpu_im_model_init_internal(const char* name) { s_surf_action_t action; s_cpu_Cas01_im_t cpu; @@ -597,18 +613,18 @@ static void surf_cpu_im_model_init_internal(void) cpu_im_running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_cpu_model->name = "CPU_IM"; + surf_cpu_model->name = name; surf_cpu_model->action_unref = cpu_im_action_unref; surf_cpu_model->action_cancel = cpu_im_action_cancel; surf_cpu_model->action_state_set = cpu_im_cpu_action_state_set; surf_cpu_model->model_private->resource_used = cpu_im_resource_used; - surf_cpu_model->model_private->share_resources = cpu_im_share_resources; + surf_cpu_model->model_private->share_resources = generic_share_resources; surf_cpu_model->model_private->update_actions_state = - cpu_im_update_actions_state; + generic_update_actions_state;//ok surf_cpu_model->model_private->update_resource_state = - cpu_im_update_resource_state; + cpu_im_update_resource_state;//ok surf_cpu_model->model_private->finalize = cpu_im_finalize; surf_cpu_model->suspend = cpu_im_action_suspend; @@ -635,11 +651,13 @@ static void surf_cpu_im_model_init_internal(void) sg_maxmin_selective_update = 1; cpu_im_maxmin_system = lmm_system_new(); } - cpu_im_action_heap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(cpu_im_action_heap, - cpu_im_action_update_index_heap); - cpu_im_modified_cpu = - xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); + if(!strcmp(surf_cpu_model->name,"CPU_IM")){ + cpu_im_action_heap = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(cpu_im_action_heap, + cpu_im_action_update_index_heap); + cpu_im_modified_cpu = + xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup)); + } } /*********************************************************************/ @@ -657,11 +675,86 @@ static void surf_cpu_im_model_init_internal(void) /* note = "Available at */ /* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */ /* } */ + void surf_cpu_model_init_Cas01_im() { + char* name; + if( strcmp(xbt_cfg_get_string(_surf_cfg_set, "cpu/model"),"Cas01")) + name = "CPU"; + else + name = "CPU_IM"; + +// XBT_INFO("cpu model: %s",name); + if (surf_cpu_model) return; - surf_cpu_im_model_init_internal(); + surf_cpu_im_model_init_internal(name); cpu_im_define_callbacks(); xbt_dynar_push(model_list, &surf_cpu_model); } + +double generic_share_resources(double now) +{ + surf_action_cpu_Cas01_im_t action; + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + return cpu_im_share_resources(now); + else if(!strcmp(surf_cpu_model->name,"CPU")) + { + return generic_maxmin_share_resources(surf_cpu_model->states.running_action_set, + xbt_swag_offset(*action, generic_lmm_action.variable), + cpu_im_maxmin_system, lmm_solve); + } + xbt_die("Not recognized surf cpu model!"); + return 0; +} + +static void cpu_update_actions_state(double now, double delta) +{ + surf_action_cpu_Cas01_im_t action = NULL; + surf_action_cpu_Cas01_im_t next_action = NULL; + xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; + xbt_swag_foreach_safe(action, next_action, running_actions) { +#ifdef HAVE_TRACING + if (TRACE_is_enabled()) { + cpu_Cas01_t x = + lmm_constraint_id(lmm_get_cnst_from_var + (cpu_maxmin_system, action->variable, 0)); + + TRACE_surf_host_set_utilization(x->generic_resource.name, + action->generic_action.data, + (surf_action_t) action, + lmm_variable_getvalue + (action->variable), now - delta, + delta); + TRACE_last_timestamp_to_dump = now-delta; + } +#endif + double_update(&(GENERIC_ACTION(action).remains), + lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta); + if (GENERIC_LMM_ACTION(action).generic_action.max_duration != NO_MAX_DURATION) + double_update(&(GENERIC_ACTION(action).max_duration), delta); + if ((GENERIC_ACTION(action).remains <= 0) && + (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) { + GENERIC_ACTION(action).finish = surf_get_clock(); + cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) && + (GENERIC_ACTION(action).max_duration <= 0)) { + GENERIC_ACTION(action).finish = surf_get_clock(); + cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); + } + } + + return; +} + +void generic_update_actions_state(double now, double delta) +{ + if(!strcmp(surf_cpu_model->name,"CPU_IM")) + cpu_im_update_actions_state(now, delta); + else if(!strcmp(surf_cpu_model->name,"CPU")) + { + cpu_update_actions_state(now, delta); + } + else + xbt_die("Not recognized surf cpu model!"); +} diff --git a/src/surf/surf.c b/src/surf/surf.c index 142e0bcda5..1858f946d1 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -152,7 +152,7 @@ s_surf_model_description_t surf_network_model_description[] = { s_surf_model_description_t surf_cpu_model_description[] = { {"Cas01_fullupdate", "CPU classical model time=size/power", - surf_cpu_model_init_Cas01}, + surf_cpu_model_init_Cas01_im}, {"Cas01", "Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster", surf_cpu_model_init_Cas01_im}, -- 2.20.1