X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4e90c90bde9bc53b419e1626c9caeac5ad25fc..4aca100a662f2662abd12850ddb62dd3415aaf16:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 85b0f8377a..ee4382033b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -45,6 +45,12 @@ typedef struct s_smpi_factor { double value; } s_smpi_factor_t; +typedef struct s_net_card *net_card_t; +typedef struct s_net_card { + char* name; + void* routing_obj; +} s_net_card_t; + double sg_sender_gap = 0.0; double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ @@ -436,10 +442,10 @@ static double net_share_resources_full(double now) xbt_swag_foreach(action, running_actions) { #ifdef HAVE_LATENCY_BOUND_TRACKING - if (lmm_is_variable_limited_by_latency(action->variable)) { - GENERIC_LMM_ACTION(action).latency_limited = 1; + if (lmm_is_variable_limited_by_latency(GENERIC_LMM_ACTION(action).variable)) { + action->latency_limited = 1; } else { - GENERIC_LMM_ACTION(action).latency_limited = 0; + action->latency_limited = 0; } #endif if (action->latency > 0) { @@ -811,7 +817,7 @@ static surf_action_t net_communicate(const char *src_name, surf_action_new(sizeof(s_surf_action_network_CM02_t), size, surf_network_model, failed); #ifdef HAVE_LATENCY_BOUND_TRACKING - (GENERIC_LMM_ACTION(action)).latency_limited = 0; + action->latency_limited = 0; #endif action->weight = action->latency = latency;