network actions should be suspendable too. In fact it seems to me that it is the...

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index f6fa9e4..56b4dd8 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -166,14 +166,14 @@ static void parse_file(const char *file)
   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();
@@ -184,7 +184,7 @@ static void parse_file(const char *file)
   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();
 }
 
@@ -275,7 +275,7 @@ static void update_actions_state(double now, double delta)
        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 -=
@@ -283,7 +283,7 @@ static void update_actions_state(double now, double delta)
     if (action->generic_action.max_duration != NO_MAX_DURATION)
       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();
@@ -322,10 +322,9 @@ static void update_resource_state(void *id,
                                  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;
@@ -401,6 +400,25 @@ static surf_action_t communicate(void *src, void *dst, double size)
   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;
@@ -442,7 +460,6 @@ static void surf_network_resource_init_internal(void)
       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);
 
@@ -477,6 +494,9 @@ static void surf_network_resource_init_internal(void)
   surf_network_resource->common_private->finalize = finalize;
 
   surf_network_resource->extension_public->communicate = communicate;
+  surf_network_resource->extension_public->suspend = action_suspend;
+  surf_network_resource->extension_public->resume = action_resume;
+  surf_network_resource->extension_public->is_suspended = action_is_suspended;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();
@@ -484,7 +504,18 @@ static void surf_network_resource_init_internal(void)
   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;