From db18cc7478c6fc7ce0d9e0c171b7fcb3cfc12491 Mon Sep 17 00:00:00 2001 From: alegrand Date: Tue, 7 Dec 2004 18:15:53 +0000 Subject: [PATCH] Network module is working. Does not take latencies into account yet though. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@551 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/network.c | 438 +++++++++++++++++++++++++++++++----- src/surf/network_private.h | 33 ++- testsuite/surf/platform.txt | 9 +- testsuite/surf/surf_usage.c | 31 ++- 4 files changed, 449 insertions(+), 62 deletions(-) diff --git a/src/surf/network.c b/src/surf/network.c index dc854770e7..dec74d3d49 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -6,67 +6,269 @@ #include "network_private.h" #include "xbt/dict.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf ,"Logging specific to the SURF network module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf, + "Logging specific to the SURF network module"); surf_network_resource_t surf_network_resource = NULL; -static xbt_dict_t network_set = NULL; +static xbt_dict_t network_link_set = NULL; +static xbt_dict_t network_card_set = NULL; +static int card_number = 0; +static network_link_t **routing_table = NULL; +static int *routing_table_size = NULL; -static void *route_new(const char *src, const char* dst) +#define ROUTE(i,j) routing_table[(i)+(j)*card_number] +#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number] + +static void create_routing_table(void) +{ + routing_table = xbt_new0(network_link_t *,card_number*card_number); + routing_table_size = xbt_new0(int,card_number*card_number); +} + +static void network_link_free(void *nw_link) +{ + xbt_free(nw_link); +} + +static network_link_t network_link_new(const char *name, + xbt_maxmin_float_t bw_initial, + tmgr_trace_t bw_trace, + xbt_maxmin_float_t lat_initial, + tmgr_trace_t lat_trace, + e_surf_network_link_state_t state_initial, + tmgr_trace_t state_trace) { - return NULL; + network_link_t nw_link = xbt_new0(s_network_link_t, 1); + + + nw_link->resource = (surf_resource_t) surf_network_resource; + nw_link->name = name; + nw_link->bw_current = bw_initial; + if (bw_trace) + nw_link->bw_event = + tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); + nw_link->lat_current = lat_initial; + if (lat_trace) + nw_link->lat_event = + tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); + nw_link->state_current = state_initial; + if (state_trace) + nw_link->state_event = + tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); + + nw_link->constraint = + lmm_constraint_new(maxmin_system, nw_link, + nw_link->bw_current); + + xbt_dict_set(network_link_set, name, nw_link, network_link_free); + + return nw_link; +} + +static int network_card_new(const char *card_name) +{ + network_card_t card = NULL; + + xbt_dict_get(network_card_set, card_name, (void *) &card); + + if(!card) { + card = xbt_new0(s_network_card_t,1); + card->name=xbt_strdup(card_name); + card->id=card_number++; + xbt_dict_set(network_card_set, card_name, card, NULL); + } + return card->id; +} + +static void route_new(int src_id, int dst_id, + char* *links, int nb_link) +{ + network_link_t *link_list = NULL; + int i ; + + ROUTE_SIZE(src_id,dst_id) = nb_link; + link_list = (ROUTE(src_id,dst_id) = xbt_new0(network_link_t,nb_link)); + for(i=0; i < nb_link; i++) { + xbt_dict_get(network_link_set,links[i], (void *) &(link_list[i])); + xbt_free(links[i]); + } + xbt_free(links); } /* - Semantic: name scale initial power initial state - power trace state trace + Semantic: name initial bandwidth initial latency initial state + bandwidth trace latency trace state trace - Token: TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD - Type: string float float string ON/OFF string + Token: TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD + Type: string float string float string ON/OFF string */ - -static void parse_route(void) +static void parse_network_link(void) { - route_new(NULL,NULL); + e_surf_token_t token; + char *name; + xbt_maxmin_float_t bw_initial; + tmgr_trace_t bw_trace; + xbt_maxmin_float_t lat_initial; + tmgr_trace_t lat_trace; + e_surf_network_link_state_t state_initial; + tmgr_trace_t state_trace; + + name = xbt_strdup(surf_parse_text); + + surf_parse_float(&bw_initial); + surf_parse_trace(&bw_trace); + surf_parse_float(&lat_initial); + surf_parse_trace(&lat_trace); + + token = surf_parse(); /* state_initial */ + xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos); + if (strcmp(surf_parse_text, "ON") == 0) + state_initial = SURF_NETWORK_LINK_ON; + else if (strcmp(surf_parse_text, "OFF") == 0) + state_initial = SURF_NETWORK_LINK_OFF; + else { + CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n", line_pos, + surf_parse_text); + xbt_abort(); + } + + surf_parse_trace(&state_trace); + + network_link_new(name, bw_initial, bw_trace, + lat_initial, lat_trace, + state_initial, state_trace); } -static void parse_file(const char *file) +/* + Semantic: source destination network + links + + Token: TOKEN_WORD TOKEN_WORD TOKEN_LP TOKEN_WORD* TOKEN_RP + Type: string string string +*/ +static void parse_route(int fake) { + int src_id = -1; + int dst_id = -1; + int nb_link = 0; + char **link_name = NULL; e_surf_token_t token; - find_section(file,"NETWORK"); + src_id = network_card_new(surf_parse_text); - while(1) { - token=surf_parse(); + token = surf_parse(); + xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos); + dst_id = network_card_new(surf_parse_text); - if(token==TOKEN_END_SECTION) break; - if(token==TOKEN_NEWLINE) continue; - - if(token==TOKEN_WORD) parse_route(); - else {CRITICAL1("Parse error line %d\n",line_pos);xbt_abort();} + token = surf_parse(); + xbt_assert1((token == TOKEN_LP), "Parse error line %d", line_pos); + + while((token = surf_parse())==TOKEN_WORD) { + if(!fake) { + nb_link++; + link_name=xbt_realloc(link_name, (nb_link) * sizeof(char*)); + link_name[(nb_link)-1]=xbt_strdup(surf_parse_text); + } } + xbt_assert1((token == TOKEN_RP), "Parse error line %d", line_pos); - close_section("NETWORK"); + if(!fake) route_new(src_id,dst_id,link_name, nb_link); +} + +static void parse_file(const char *file) +{ + e_surf_token_t token; + + /* Figuring out the network links in the system */ + find_section(file, "NETWORK"); + while (1) { + token = surf_parse(); + + if (token == TOKEN_END_SECTION) + break; + if (token == TOKEN_NEWLINE) + continue; + + if (token == TOKEN_WORD) + parse_network_link(); + else { + CRITICAL1("Parse error line %d\n", line_pos); + xbt_abort(); + } + } + close_section("NETWORK"); + + /* Figuring out the network cards used */ + find_section(file, "ROUTE"); + while (1) { + token = surf_parse(); + + if (token == TOKEN_END_SECTION) + break; + if (token == TOKEN_NEWLINE) + continue; + + if (token == TOKEN_WORD) + parse_route(1); + else { + CRITICAL1("Parse error line %d\n", line_pos); + xbt_abort(); + } + } + close_section("ROUTE"); + + create_routing_table(); + + /* Building the routes */ + find_section(file, "ROUTE"); + while (1) { + token = surf_parse(); + + if (token == TOKEN_END_SECTION) + break; + if (token == TOKEN_NEWLINE) + continue; + + if (token == TOKEN_WORD) + parse_route(0); + else { + CRITICAL1("Parse error line %d\n", line_pos); + xbt_abort(); + } + } + close_section("ROUTE"); } static void *name_service(const char *name) { - return NULL; + network_card_t card = NULL; + + xbt_dict_get(network_card_set, name, (void *) &card); + + return card; } static const char *get_resource_name(void *resource_id) { - return NULL; + return ((network_card_t) resource_id)->name; } static int resource_used(void *resource_id) { - return 0; + return lmm_constraint_used(maxmin_system, + ((network_link_t) resource_id)->constraint); } static void action_free(surf_action_t action) { + surf_action_network_t Action = (surf_action_network_t) action; + + xbt_swag_remove(action, action->state_set); + lmm_variable_free(maxmin_system, Action->variable); + xbt_free(action); + return; } @@ -80,80 +282,212 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, e_surf_action_state_t state) +static void action_change_state(surf_action_t action, + e_surf_action_state_t state) { + surf_action_change_state(action, state); return; } static xbt_heap_float_t share_resources(xbt_heap_float_t now) { - return -1.0; + surf_action_network_t action = NULL; + xbt_swag_t running_actions = + surf_network_resource->common_public->states.running_action_set; + xbt_maxmin_float_t min = -1; + xbt_maxmin_float_t value = -1; + lmm_solve(maxmin_system); + + action = xbt_swag_getFirst(running_actions); + if (!action) + return -1.0; + value = lmm_variable_getvalue(action->variable); + min = action->generic_action.remains / value; + + xbt_swag_foreach(action, running_actions) { + value = action->generic_action.remains / + lmm_variable_getvalue(action->variable); + if (value < min) + min = value; + } + + return min; } + static void update_actions_state(xbt_heap_float_t now, xbt_heap_float_t delta) { + surf_action_network_t action = NULL; + surf_action_network_t next_action = NULL; + xbt_swag_t running_actions = + surf_network_resource->common_public->states.running_action_set; + xbt_swag_t failed_actions = + surf_network_resource->common_public->states.failed_action_set; + + xbt_swag_foreach_safe(action, next_action, running_actions) { + action->generic_action.remains -= + lmm_variable_getvalue(action->variable) * delta; +/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ + + if (action->generic_action.remains <= 0) { + action_change_state((surf_action_t) action, SURF_ACTION_DONE); + } else { /* Need to check that none of the resource has failed */ + lmm_constraint_t cnst = NULL; + int i = 0; + network_link_t nw_link = NULL; + + while ((cnst = + lmm_get_cnst_from_var(maxmin_system, action->variable, + i++))) { + nw_link = lmm_constraint_id(cnst); + if (nw_link->state_current == SURF_NETWORK_LINK_OFF) { + action_change_state((surf_action_t) action, SURF_ACTION_FAILED); + break; + } + } + } + } + + xbt_swag_foreach_safe(action, next_action, failed_actions) { + lmm_variable_disable(maxmin_system, action->variable); + } + return; } static void update_resource_state(void *id, - tmgr_trace_event_t event_type, + tmgr_trace_event_t event_type, xbt_maxmin_float_t value) { + network_link_t nw_link = id; + +/* printf("[" XBT_HEAP_FLOAT_T "] Asking to update network card \"%s\" with value " */ +/* XBT_MAXMIN_FLOAT_T " for event %p\n", surf_get_clock(), nw_link->name, */ +/* value, event_type); */ + + if (event_type == nw_link->bw_event) { + nw_link->bw_current = value; + lmm_update_constraint_bound(maxmin_system, nw_link->constraint, + nw_link->bw_current); + } else if (event_type == nw_link->lat_event) { + nw_link->lat_current = value; + } else if (event_type == nw_link->state_event) { + if (value > 0) + nw_link->state_current = SURF_NETWORK_LINK_ON; + else + nw_link->state_current = SURF_NETWORK_LINK_OFF; + } else { + CRITICAL0("Unknown event ! \n"); + xbt_abort(); + } + return; } -static surf_action_t communicate(void *src, void *dst, xbt_maxmin_float_t size) +static surf_action_t communicate(void *src, void *dst, + xbt_maxmin_float_t size) { - return NULL; + surf_action_network_t action = NULL; + network_card_t card_src = src; + network_card_t card_dst = dst; + int route_size = ROUTE_SIZE(card_src->id,card_dst->id); + network_link_t *route = ROUTE(card_src->id,card_dst->id); + int i; + + action = xbt_new0(s_surf_action_network_t, 1); + + action->generic_action.cost = size; + action->generic_action.remains = size; + action->generic_action.start = -1.0; + action->generic_action.finish = -1.0; + action->generic_action.callback = NULL; + action->generic_action.resource_type = + (surf_resource_t) surf_network_resource; + + action->generic_action.state_set = + surf_network_resource->common_public->states.running_action_set; + + xbt_swag_insert(action, action->generic_action.state_set); + + action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, + route_size); + for(i=0; iconstraint, action->variable, + 1.0); + + return (surf_action_t) action; } static void finalize(void) { + xbt_dict_free(&network_card_set); + xbt_dict_free(&network_link_set); + xbt_swag_free(surf_network_resource->common_public->states.ready_action_set); + xbt_swag_free(surf_network_resource->common_public->states. + running_action_set); + xbt_swag_free(surf_network_resource->common_public->states. + failed_action_set); + xbt_swag_free(surf_network_resource->common_public->states.done_action_set); + xbt_free(surf_network_resource->common_public); + xbt_free(surf_network_resource->common_private); + xbt_free(surf_network_resource->extension_public); + + xbt_free(surf_network_resource); + surf_network_resource = NULL; } static void surf_network_resource_init_internal(void) { s_surf_action_t action; - surf_network_resource = xbt_new0(s_surf_network_resource_t,1); - - surf_network_resource->common_private = xbt_new0(s_surf_resource_private_t,1); - surf_network_resource->common_public = xbt_new0(s_surf_resource_public_t,1); -/* surf_network_resource->extension_private = xbt_new0(s_surf_network_resource_extension_private_t,1); */ - surf_network_resource->extension_public = xbt_new0(s_surf_network_resource_extension_public_t,1); + surf_network_resource = xbt_new0(s_surf_network_resource_t, 1); - surf_network_resource->common_public->states.ready_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_network_resource->common_public->states.running_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_network_resource->common_public->states.failed_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_network_resource->common_public->states.done_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); + surf_network_resource->common_private = + xbt_new0(s_surf_resource_private_t, 1); + surf_network_resource->common_public = + xbt_new0(s_surf_resource_public_t, 1); +/* surf_network_resource->extension_private = xbt_new0(s_surf_network_resource_extension_private_t,1); */ + surf_network_resource->extension_public = + xbt_new0(s_surf_network_resource_extension_public_t, 1); + + surf_network_resource->common_public->states.ready_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_network_resource->common_public->states.running_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_network_resource->common_public->states.failed_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_network_resource->common_public->states.done_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_network_resource->common_public->name_service = name_service; - surf_network_resource->common_public->get_resource_name = get_resource_name; - surf_network_resource->common_public->resource_used = resource_used; - surf_network_resource->common_public->action_get_state=surf_action_get_state; + surf_network_resource->common_public->get_resource_name = + get_resource_name; + surf_network_resource->common_public->action_get_state = + surf_action_get_state; surf_network_resource->common_public->action_free = action_free; surf_network_resource->common_public->action_cancel = action_cancel; surf_network_resource->common_public->action_recycle = action_recycle; - surf_network_resource->common_public->action_change_state = action_change_state; + surf_network_resource->common_public->action_change_state = + action_change_state; + surf_network_resource->common_private->resource_used = resource_used; surf_network_resource->common_private->share_resources = share_resources; - surf_network_resource->common_private->update_actions_state = update_actions_state; - surf_network_resource->common_private->update_resource_state = update_resource_state; + surf_network_resource->common_private->update_actions_state = + update_actions_state; + surf_network_resource->common_private->update_resource_state = + update_resource_state; surf_network_resource->common_private->finalize = finalize; surf_network_resource->extension_public->communicate = communicate; - network_set = xbt_dict_new(); + network_link_set = xbt_dict_new(); + network_card_set = xbt_dict_new(); - xbt_assert0(maxmin_system,"surf_init has to be called first!"); + xbt_assert0(maxmin_system, "surf_init has to be called first!"); } -void surf_network_resource_init(const char* filename) +void surf_network_resource_init(const char *filename) { surf_network_resource_init_internal(); parse_file(filename); diff --git a/src/surf/network_private.h b/src/surf/network_private.h index 0f58113062..52e943c18e 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -8,16 +8,37 @@ #include "surf_private.h" -typedef struct surf_action_network { - s_surf_action_t generic_action; - lmm_variable_t variable; -} s_surf_action_network_t, *surf_action_network_t; +typedef enum { + SURF_NETWORK_LINK_ON = 1, /* Ready */ + SURF_NETWORK_LINK_OFF = 0 /* Running */ +} e_surf_network_link_state_t; -typedef struct network { +typedef struct network_link { surf_resource_t resource; /* Any such object, added in a trace should start by this field!!! */ + /* Using this object with the public part of + resource does not make sense */ const char *name; -} s_network_t, *network_t; + xbt_maxmin_float_t bw_current; + tmgr_trace_event_t bw_event; + xbt_maxmin_float_t lat_current; + tmgr_trace_event_t lat_event; + e_surf_network_link_state_t state_current; + tmgr_trace_event_t state_event; + lmm_constraint_t constraint; +} s_network_link_t, *network_link_t; + +typedef struct network_card { + const char *name; + int id; +} s_network_card_t, *network_card_t; + +typedef struct surf_action_network { + s_surf_action_t generic_action; + lmm_variable_t variable; + network_card_t src; + network_card_t dst; +} s_surf_action_network_t, *surf_action_network_t; #endif /* _SURF_NETWORK_PRIVATE_H */ diff --git a/testsuite/surf/platform.txt b/testsuite/surf/platform.txt index fba1b8acf8..f6ceb71edd 100644 --- a/testsuite/surf/platform.txt +++ b/testsuite/surf/platform.txt @@ -1,11 +1,16 @@ "Cpu A" 100.00 1.0 trace_A.txt ON trace_A_failure.txt - "Cpu B" 100.00 1.0 trace_B.txt ON "" + "Cpu B" 100.00 1.0 trace_B.txt ON "" - /* The network section */ + /* The network section */ + LinkA 10.0 "" 0.01 "" ON "" + + /* The route section */ + "Cpu A" "Cpu B" (LinkA ) + diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 8626beb145..f7eda0e613 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -33,8 +33,11 @@ void test(void) { void *cpuA = NULL; void *cpuB = NULL; + void *cardA = NULL; + void *cardB = NULL; surf_action_t actionA = NULL; surf_action_t actionB = NULL; + surf_action_t commAB = NULL; e_surf_action_state_t stateActionA; e_surf_action_state_t stateActionB; xbt_maxmin_float_t now = -1.0; @@ -43,6 +46,7 @@ void test(void) surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */ surf_network_resource_init("platform.txt"); /* Now it is possible to use eth0 */ + /*********************** CPU ***********************************/ printf("%p \n", surf_cpu_resource); cpuA = surf_cpu_resource->common_public->name_service("Cpu A"); cpuB = surf_cpu_resource->common_public->name_service("Cpu B"); @@ -63,19 +67,42 @@ void test(void) printf("actionA : %p (%s)\n", actionA, string_action(stateActionA)); printf("actionB : %p (%s)\n", actionB, string_action(stateActionB)); + /*********************** Network *******************************/ + printf("%p \n", surf_network_resource); + cardA = surf_network_resource->common_public->name_service("Cpu A"); + cardB = surf_network_resource->common_public->name_service("Cpu B"); + + /* Let's check that those two processors exist */ + printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardA), cardA); + printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardB), cardB); + + /* Let's do something on it */ + commAB = surf_network_rescpource->extension_public->communicate(cardA, cardB, 132.0); + surf_solve(); /* Takes traces into account. Returns 0.0 */ do { surf_action_t action = NULL; now = surf_get_clock(); printf("Next Event : " XBT_HEAP_FLOAT_T "\n", now); + printf("\t CPU actions\n"); while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.failed_action_set)) { - printf("\tFailed : %p\n", action); + printf("\t * Failed : %p\n", action); action->resource_type->common_public->action_free(action); } while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.done_action_set)) { - printf("\tDone : %p\n", action); + printf("\t * Done : %p\n", action); action->resource_type->common_public->action_free(action); } + printf("\t Network actions\n"); + while(action=xbt_swag_extract(surf_network_resource->common_public->states.failed_action_set)) { + printf("\t * Failed : %p\n", action); + action->resource_type->common_public->action_free(action); + } + while(action=xbt_swag_extract(surf_network_resource->common_public->states.done_action_set)) { + printf("\t * Done : %p\n", action); + action->resource_type->common_public->action_free(action); + } + } while(surf_solve()); printf("Simulation Terminated\n"); -- 2.20.1