surf_parse_reset_parser();
ETag_network_link_fun=parse_network_link;
surf_parse_open(file);
- surf_parse_lex();
+ xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
/* Figuring out the network cards used */
surf_parse_reset_parser();
STag_route_fun=parse_route_set_endpoints;
surf_parse_open(file);
- surf_parse_lex();
+ xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
create_routing_table();
ETag_route_element_fun=parse_route_elem;
ETag_route_fun=parse_route_set_route;
surf_parse_open(file);
- surf_parse_lex();
+ xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
}
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);
+ if(((surf_action_network_t)action)->variable)
+ lmm_variable_free(maxmin_system, ((surf_action_network_t)action)->variable);
xbt_free(action);
return;
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_t)action)->variable) {
+ lmm_variable_free(maxmin_system, ((surf_action_network_t)action)->variable);
+ ((surf_action_network_t)action)->variable = NULL;
+ }
+
surf_action_change_state(action, state);
return;
}
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
- action->latency -= deltap;
+ surf_double_update(&(action->latency),deltap);
deltap = 0.0;
} else {
- deltap -= action->latency;
+ surf_double_update(&(deltap), action->latency);
action->latency = 0.0;
}
- if (action->latency == 0.0)
+ if ((action->latency == 0.0) && !(action->suspended))
lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
}
- action->generic_action.remains -=
- lmm_variable_getvalue(action->variable) * deltap;
+ surf_double_update(&(action->generic_action.remains),
+ lmm_variable_getvalue(action->variable) * deltap);
if (action->generic_action.max_duration != NO_MAX_DURATION)
- action->generic_action.max_duration -= delta;
+ surf_double_update(&(action->generic_action.max_duration), delta);
-/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
+ /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
if (action->generic_action.remains <= 0) {
action->generic_action.finish = surf_get_clock();
double value)
{
network_link_t nw_link = id;
-
-/* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
-/* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */
-/* value, event_type); */
+ /* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
+ /* "%lg" " 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;
while (lmm_get_var_from_cnst(maxmin_system, nw_link->constraint, &var)) {
action = lmm_variable_id(var);
action->lat_current += delta;
- lmm_update_variable_bound(maxmin_system, var,
- 1 / (action->lat_current));
+ 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));
}
} else if (event_type == nw_link->state_event) {
if (value > 0)
return;
}
-static surf_action_t communicate(void *src, void *dst, double size)
+static surf_action_t communicate(void *src, void *dst, double size, double rate)
{
surf_action_network_t action = NULL;
network_card_t card_src = src;
surf_network_resource->common_public->states.running_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
+ action->rate = rate;
action->latency = 0.0;
for (i = 0; i < route_size; i++)
action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
route_size);
- lmm_update_variable_bound(maxmin_system, action->variable,
- SG_TCP_CTE_GAMMA / action->lat_current);
+ 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);
+ }
for (i = 0; i < route_size; i++)
lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
return (surf_action_t) action;
}
+static void action_suspend(surf_action_t action)
+{
+ ((surf_action_network_t) action)->suspended = 1;
+ lmm_update_variable_weight(maxmin_system,
+ ((surf_action_network_t) action)->variable, 0.0);
+}
+
+static void action_resume(surf_action_t action)
+{
+ lmm_update_variable_weight(maxmin_system,
+ ((surf_action_network_t) action)->variable, 1.0);
+ ((surf_action_network_t) action)->suspended = 0;
+}
+
+static int action_is_suspended(surf_action_t action)
+{
+ return ((surf_action_network_t) action)->suspended;
+}
+
static void finalize(void)
{
int i,j;
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);
update_resource_state;
surf_network_resource->common_private->finalize = finalize;
+ 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_network_resource->extension_public->communicate = communicate;
network_link_set = xbt_dict_new();
xbt_assert0(maxmin_system, "surf_init has to be called first!");
}
-void surf_network_resource_init(const char *filename)
+/***************************************************************************/
+/* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
+/***************************************************************************/
+/* @TechReport{ rr-lip2002-40, */
+/* author = {Henri Casanova and Loris Marchal}, */
+/* institution = {LIP}, */
+/* title = {A Network Model for Simulation of Grid Application}, */
+/* number = {2002-40}, */
+/* month = {oct}, */
+/* year = {2002} */
+/* } */
+void surf_network_resource_init_CM02(const char *filename)
{
if (surf_network_resource)
return;