X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a34c13fc69ef21965703fc99a3a704b7cf9b8f3..bde7727d0348b515671007ed00ac82152c01d774:/src/surf/network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index ec361a979e..e7536d6bcf 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -157,12 +157,12 @@ static void parse_link_init(void)
   char *name;
   double bw;
   double lat;
-  e_surf_link_state_t state;
+  e_surf_resource_state_t state;
 
   name = xbt_strdup(A_surfxml_link_id);
   surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
   surf_parse_get_double(&lat, A_surfxml_link_latency);
-  state = SURF_LINK_ON;
+  state = SURF_RESOURCE_ON;
 
   tmgr_trace_t bw_trace;
   tmgr_trace_t state_trace;
@@ -433,26 +433,13 @@ static void update_resource_state(void *id,
 }
 
 /* KF: Rate not supported */
+/* Max durations are not supported */
 static surf_action_t communicate(const char *src_name, const char *dst_name,int src, int dst, double size,
                                  double rate)
 {
   surf_action_network_GTNETS_t action = NULL;
 
-  action = xbt_new0(s_surf_action_network_GTNETS_t, 1);
-
-  action->generic_action.refcount = 1;
-  action->generic_action.cost = size;
-  action->generic_action.remains = size;
-  /* Max durations are not supported */
-  action->generic_action.max_duration = NO_MAX_DURATION;
-  action->generic_action.start = surf_get_clock();
-  action->generic_action.finish = -1.0;
-  action->generic_action.model_type = surf_network_model;
-
-  action->generic_action.state_set =
-    surf_network_model->states.running_action_set;
-
-  xbt_swag_insert(action, action->generic_action.state_set);
+  action = surf_action_new(sizeof(s_surf_action_network_GTNETS_t),size,surf_network_model,0);
 
   /* KF: Add a flow to the GTNets Simulation, associated to this action */
   if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {