static xbt_dict_t network_link_set = NULL;
xbt_dict_t network_card_set = NULL;
-static int card_number = 0;
-static network_link_CM02_t **routing_table = NULL;
-static int *routing_table_size = NULL;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+int card_number = 0;
+network_link_CM02_t **routing_table = NULL;
+int *routing_table_size = NULL;
+static network_link_CM02_t loopback = NULL;
static void create_routing_table(void)
{
tmgr_trace_t lat_trace,
e_surf_network_link_state_t
state_initial,
- tmgr_trace_t state_trace)
+ tmgr_trace_t state_trace,
+ e_surf_network_link_sharing_policy_t policy)
{
network_link_CM02_t nw_link = xbt_new0(s_network_link_CM02_t, 1);
nw_link->constraint =
lmm_constraint_new(maxmin_system, nw_link, nw_link->bw_current);
+ if(policy == SURF_NETWORK_LINK_FATPIPE)
+ lmm_constraint_shared(nw_link->constraint);
+
xbt_dict_set(network_link_set, name, nw_link, network_link_free);
return nw_link;
double lat_initial;
tmgr_trace_t lat_trace;
e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
+ e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED;
tmgr_trace_t state_trace;
name = xbt_strdup(A_network_link_name);
"Invalid state")
if (A_network_link_state==A_network_link_state_ON)
state_initial = SURF_NETWORK_LINK_ON;
- if (A_network_link_state==A_network_link_state_OFF)
+ else if (A_network_link_state==A_network_link_state_OFF)
state_initial = SURF_NETWORK_LINK_OFF;
+
+ if (A_network_link_sharing_policy==A_network_link_sharing_policy_SHARED)
+ policy_initial = SURF_NETWORK_LINK_SHARED;
+ else if (A_network_link_sharing_policy==A_network_link_sharing_policy_FATPIPE)
+ policy_initial = SURF_NETWORK_LINK_FATPIPE;
+
surf_parse_get_trace(&state_trace,A_network_link_state_file);
network_link_new(name, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial, state_trace);
+ lat_initial, lat_trace, state_initial, state_trace,
+ policy_initial);
}
static int nb_link = 0;
static void parse_file(const char *file)
{
+ int i;
+
/* Figuring out the network links */
surf_parse_reset_parser();
ETag_network_link_fun=parse_network_link;
surf_parse_open(file);
xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
+
+ /* Adding loopback if needed */
+
+ for (i = 0; i < card_number; i++)
+ if(!ROUTE_SIZE(i,i)) {
+ if(!loopback)
+ loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
+ 498.00, NULL, 0.000015, NULL,
+ SURF_NETWORK_LINK_ON, NULL,
+ SURF_NETWORK_LINK_FATPIPE);
+ ROUTE_SIZE(i,i)=1;
+ ROUTE(i,i) = xbt_new0(network_link_CM02_t, 1);
+ ROUTE(i,i)[0] = loopback;
+ }
}
static void *name_service(const char *name)
((network_link_CM02_t) resource_id)->constraint);
}
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
{
- xbt_swag_remove(action, action->state_set);
- if(((surf_action_network_CM02_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
- free(action);
+ action->using--;
+ if(!action->using) {
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_network_CM02_t)action)->variable)
+ lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
+ free(action);
+ return 1;
+ }
+ return 0;
+}
- return;
+static void action_use(surf_action_t action)
+{
+ action->using++;
}
static void action_cancel(surf_action_t action)
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
- if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
- if(((surf_action_network_CM02_t)action)->variable) {
- lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
- ((surf_action_network_CM02_t)action)->variable = NULL;
- }
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_network_CM02_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
+/* ((surf_action_network_CM02_t)action)->variable = NULL; */
+/* } */
surf_action_change_state(action, state);
return;
action = xbt_new0(s_surf_action_network_CM02_t, 1);
+ action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_network_resource;
-
+ action->suspended = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
action->generic_action.state_set =
surf_network_resource->common_public->states.running_action_set;
action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
route_size);
- if(action->rate<0)
- lmm_update_variable_bound(maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / action->lat_current);
- else
- lmm_update_variable_bound(maxmin_system, action->variable,
- min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
-
- if(route_size == 0) {
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ if(action->rate<0) {
+ if(action->lat_current>0)
+ lmm_update_variable_bound(maxmin_system, action->variable,
+ SG_TCP_CTE_GAMMA / action->lat_current);
+ else
+ lmm_update_variable_bound(maxmin_system, action->variable, -1.0);
+ } else {
+ if(action->lat_current>0)
+ lmm_update_variable_bound(maxmin_system, action->variable,
+ min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
+ else
+ lmm_update_variable_bound(maxmin_system, action->variable, action->rate);
}
for (i = 0; i < route_size; i++)
lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
+ if(route_size == 0) {
+ action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ }
+
return (surf_action_t) action;
}
return ((surf_action_network_CM02_t) action)->suspended;
}
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+ action->max_duration = duration;
+}
+
static void finalize(void)
{
int i,j;
free(surf_network_resource);
surf_network_resource = NULL;
+ loopback = NULL;
for (i = 0; i < card_number; i++)
for (j = 0; j < card_number; j++)
free(ROUTE(i,j));
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_use = action_use;
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 =
surf_network_resource->common_public->suspend = action_suspend;
surf_network_resource->common_public->resume = action_resume;
surf_network_resource->common_public->is_suspended = action_is_suspended;
+ surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
surf_network_resource->extension_public->communicate = communicate;
