From 5e5a85aa73a7854d577091848b08dec2351012ab Mon Sep 17 00:00:00 2001 From: Arnaud Legrand Date: Mon, 5 Mar 2012 15:29:41 +0100 Subject: [PATCH] Enable generic_lmm_action to be lazily updated by refactoring the corresponding fields: --- src/include/surf/surf.h | 4 +++ src/surf/cpu_cas01.c | 52 +++++++++++++++----------------------- src/surf/network.c | 32 ++++++++++++----------- src/surf/network_private.h | 4 --- 4 files changed, 42 insertions(+), 50 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 53d66008bd..93d8ebee75 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -99,6 +99,10 @@ typedef struct surf_action_lmm { s_surf_action_t generic_action; lmm_variable_t variable; int suspended; + s_xbt_swag_hookup_t action_list_hookup; + int index_heap; + double last_update; + enum heap_action_type hat; } s_surf_action_lmm_t, *surf_action_lmm_t; /** \brief Action states diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index db7fc747fb..e922b65df9 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -25,10 +25,6 @@ static xbt_heap_t cpu_action_heap = NULL; typedef struct surf_action_cpu_cas01 { s_surf_action_lmm_t generic_lmm_action; - s_xbt_swag_hookup_t action_list_hookup; - int index_heap; - double last_update; - enum heap_action_type hat; } s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t; typedef struct cpu_Cas01 { @@ -54,7 +50,8 @@ static xbt_swag_t /* added to manage the communication action's heap */ static void net_action_update_index_heap(void *action, int i) { - ((surf_action_cpu_Cas01_t) action)->index_heap = i; + surf_action_cpu_Cas01_t a = action; + GENERIC_LMM_ACTION(a).index_heap = i; } /* insert action on heap using a given key and a hat (heap_action_type) @@ -67,15 +64,15 @@ static void net_action_update_index_heap(void *action, int i) static void heap_insert(surf_action_cpu_Cas01_t action, double key, enum heap_action_type hat) { - action->hat = hat; + GENERIC_LMM_ACTION(action).hat = hat; xbt_heap_push(cpu_action_heap, action, key); } static void heap_remove(surf_action_cpu_Cas01_t action) { - action->hat = NOTSET; - if (((surf_action_cpu_Cas01_t) action)->index_heap >= 0) { - xbt_heap_remove(cpu_action_heap, action->index_heap); + GENERIC_LMM_ACTION(action).hat = NOTSET; + if (GENERIC_LMM_ACTION(action).index_heap >= 0) { + xbt_heap_remove(cpu_action_heap, GENERIC_LMM_ACTION(action).index_heap); } } @@ -235,7 +232,7 @@ static void update_action_remaining_lazy(double now) if (GENERIC_ACTION(action).priority <= 0) continue; - delta = now - action->last_update; + delta = now - GENERIC_LMM_ACTION(action).last_update; if (GENERIC_ACTION(action).remains > 0) { double_update(&(GENERIC_ACTION(action).remains), @@ -253,14 +250,14 @@ static void update_action_remaining_lazy(double now) (surf_action_t) action, lmm_variable_getvalue (GENERIC_LMM_ACTION(action). - variable), action->last_update, - now - action->last_update); + variable), GENERIC_LMM_ACTION(action).last_update, + now - GENERIC_LMM_ACTION(action).last_update); } #endif XBT_DEBUG("Update action(%p) remains %lf", action, GENERIC_ACTION(action).remains); } - action->last_update = now; + GENERIC_LMM_ACTION(action).last_update = now; } } @@ -364,13 +361,11 @@ static void cpu_update_actions_state_lazy(double now, double delta) (cpu_maxmin_system, GENERIC_LMM_ACTION(action).variable, 0)); TRACE_surf_host_set_utilization(cpu->generic_resource.name, - GENERIC_LMM_ACTION(action). - generic_action.data, + GENERIC_LMM_ACTION(action).generic_action.data, (surf_action_t) action, - lmm_variable_getvalue - (GENERIC_LMM_ACTION(action). - variable), action->last_update, - now - action->last_update); + lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), + GENERIC_LMM_ACTION(action).last_update, + now - GENERIC_LMM_ACTION(action).last_update); } #endif GENERIC_ACTION(action).remains = 0; @@ -385,11 +380,11 @@ static void cpu_update_actions_state_lazy(double now, double delta) xbt_swag_t running_actions = surf_cpu_model->states.running_action_set; xbt_swag_foreach(action, running_actions) { if (smaller < 0) { - smaller = action->last_update; + smaller = GENERIC_LMM_ACTION(action).last_update; continue; } - if (action->last_update < smaller) { - smaller = action->last_update; + if (GENERIC_LMM_ACTION(action).last_update < smaller) { + smaller = GENERIC_LMM_ACTION(action).last_update; } } if (smaller > 0) { @@ -519,8 +514,8 @@ static surf_action_t cpu_execute(void *cpu, double size) GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1); if (cpu_update_mechanism == UM_LAZY) { - action->index_heap = -1; - action->last_update = surf_get_clock(); + GENERIC_LMM_ACTION(action).index_heap = -1; + GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); } lmm_expand(cpu_maxmin_system, CPU->constraint, GENERIC_LMM_ACTION(action).variable, 1.0); @@ -656,11 +651,6 @@ static double cpu_get_available_speed(void *cpu) return ((cpu_Cas01_t) cpu)->power_scale; } -static void cpu_action_update_index_heap(void *action, int i) -{ - ((surf_action_cpu_Cas01_t) action)->index_heap = i; -} - static void cpu_finalize(void) { lmm_system_free(cpu_maxmin_system); @@ -736,9 +726,9 @@ static void surf_cpu_model_init_internal() if (cpu_update_mechanism == UM_LAZY) { cpu_action_heap = xbt_heap_new(8, NULL); xbt_heap_set_update_callback(cpu_action_heap, - cpu_action_update_index_heap); + net_action_update_index_heap); cpu_modified_set = - xbt_swag_new(xbt_swag_offset(comp, action_list_hookup)); + xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup)); cpu_maxmin_system->keep_track = cpu_modified_set; } } diff --git a/src/surf/network.c b/src/surf/network.c index 67044e4da3..493623e2d2 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -67,7 +67,8 @@ static xbt_heap_t net_action_heap = NULL; /* added to manage the communication action's heap */ static void net_action_update_index_heap(void *action, int i) { - ((surf_action_network_CM02_t) action)->index_heap = i; + surf_action_network_CM02_t a = action; + GENERIC_LMM_ACTION(a).index_heap = i; } /* insert action on heap using a given key and a hat (heap_action_type) @@ -80,15 +81,15 @@ static void net_action_update_index_heap(void *action, int i) static void heap_insert(surf_action_network_CM02_t action, double key, enum heap_action_type hat) { - action->hat = hat; + GENERIC_LMM_ACTION(action).hat = hat; xbt_heap_push(net_action_heap, action, key); } static void heap_remove(surf_action_network_CM02_t action) { - action->hat = NOTSET; - if (((surf_action_network_CM02_t) action)->index_heap >= 0) { - xbt_heap_remove(net_action_heap, action->index_heap); + GENERIC_LMM_ACTION(action).hat = NOTSET; + if (GENERIC_LMM_ACTION(action).index_heap >= 0) { + xbt_heap_remove(net_action_heap, GENERIC_LMM_ACTION(action).index_heap); } } @@ -396,7 +397,7 @@ static void update_action_remaining_lazy(double now) continue; } - delta = now - action->last_update; + delta = now - GENERIC_LMM_ACTION(action).last_update; double_update(&(((surf_action_t)action)->remains), lmm_variable_getvalue(((surf_action_lmm_t) action)->variable) * delta); @@ -418,7 +419,7 @@ static void update_action_remaining_lazy(double now) heap_remove(action); } - action->last_update = now; + GENERIC_LMM_ACTION(action).last_update = now; } } @@ -617,14 +618,15 @@ static void net_update_actions_state_lazy(double now, double delta) GENERIC_ACTION(action).finish = surf_get_clock(); // if I am wearing a latency hat - if (action->hat == LATENCY) { + if (GENERIC_LMM_ACTION(action).hat == LATENCY) { lmm_update_variable_weight(network_maxmin_system, GENERIC_LMM_ACTION(action).variable, action->weight); heap_remove(action); - action->last_update = surf_get_clock(); + GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); // if I am wearing a max_duration or normal hat - } else if (action->hat == MAX_DURATION || action->hat == NORMAL) { + } else if (GENERIC_LMM_ACTION(action).hat == MAX_DURATION || + GENERIC_LMM_ACTION(action).hat == NORMAL) { // no need to communicate anymore // assume that flows that reached max_duration have remaining of 0 GENERIC_ACTION(action).remains = 0; @@ -804,8 +806,8 @@ static surf_action_t net_communicate(const char *src_name, xbt_swag_insert(action, ((surf_action_t)action)->state_set); action->rate = rate; if (network_update_mechanism == UM_LAZY) { - action->index_heap = -1; - action->last_update = surf_get_clock(); + GENERIC_LMM_ACTION(action).index_heap = -1; + GENERIC_LMM_ACTION(action).last_update = surf_get_clock(); } bandwidth_bound = -1.0; @@ -849,8 +851,8 @@ static surf_action_t net_communicate(const char *src_name, if (network_update_mechanism == UM_LAZY) { // add to the heap the event when the latency is payed XBT_DEBUG("Added action (%p) one latency event at date %f", action, - action->latency + action->last_update); - heap_insert(action, action->latency + action->last_update, + action->latency + GENERIC_LMM_ACTION(action).last_update); + heap_insert(action, action->latency + GENERIC_LMM_ACTION(action).last_update, xbt_dynar_is_empty(route) ? NORMAL : LATENCY); } } else @@ -1113,7 +1115,7 @@ static void surf_network_model_init_internal(void) xbt_heap_set_update_callback(net_action_heap, net_action_update_index_heap); net_modified_set = - xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); + xbt_swag_new(xbt_swag_offset(comm, generic_lmm_action.action_list_hookup)); network_maxmin_system->keep_track = net_modified_set; } } diff --git a/src/surf/network_private.h b/src/surf/network_private.h index ced7281db7..756d7f29fa 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -22,10 +22,6 @@ typedef struct network_link_CM02 { typedef struct surf_action_network_CM02 { s_surf_action_lmm_t generic_lmm_action; - s_xbt_swag_hookup_t action_list_hookup; - int index_heap; - double last_update; - enum heap_action_type hat; double latency; double lat_current; double weight; -- 2.20.1