Cope avec refurbished interface.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9255 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
index ea377f8..9738883 100644 (file)
--- a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
+++ b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh
@@ -11,4 +11,3 @@ $ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/mode
 > [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171
 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ;  message from S1 to C1  with remaining : 0.000000
 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ;  message from S2 to C2  with remaining : 0.000000
-

diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
index 08f7d4f..05e45b0 100644 (file)
--- a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
+++ b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh
@@ -12,6 +12,4 @@ $ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/mode
 > [S2:master:(2) 0.342000] [msg_test/INFO] Completed peer: C2 time: 0.342000
 > [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[0] is limited by latency!!
 > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[1] is limited by latency!!
 > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ;  message from S2 to C2  with remaining : 0.000000
-

diff --git a/examples/msg/gtnets/gtnets-fullduplex.tesh b/examples/msg/gtnets/gtnets-fullduplex.tesh
index f41bfde..e61460e 100644 (file)
--- a/examples/msg/gtnets/gtnets-fullduplex.tesh
+++ b/examples/msg/gtnets/gtnets-fullduplex.tesh
@@ -11,19 +11,16 @@ $ gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex
 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3063.735285 ;  message from S1 to C1  with remaining : 666666.666667
 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[4] : 9191.205854 ;  message from C1 to S1  with remaining : 0.000000
 
+
 p Testing fullduplex TCP option ENABLED
 
 $ gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:1
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '1'
 > [S1:master:(1) 331.625739] [msg_test/INFO] Send completed (to C1). Transfer time: 331.625739  Agregate bandwidth: 3015.447482
 > [S1:master:(1) 331.625739] [msg_test/INFO] Completed peer: C1 time: 331.625739
-> [S1:master:(3) 331.625739] [msg_test/INFO] Send completed (to C1). Transfer time: 331.625739  Agregate bandwidth: 3015.447482
-> [S1:master:(3) 331.625739] [msg_test/INFO] Completed peer: C1 time: 331.625739
-> [S1:master:(5) 331.625739] [msg_test/INFO] Send completed (to C1). Transfer time: 331.625739  Agregate bandwidth: 3015.447482
-> [S1:master:(5) 331.625739] [msg_test/INFO] Completed peer: C1 time: 331.625739
-> [C1:master:(7) 331.625739] [msg_test/INFO] Send completed (to S1). Transfer time: 331.625739  Agregate bandwidth: 3015.447482
-> [C1:master:(7) 331.625739] [msg_test/INFO] Completed peer: S1 time: 331.625739
 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3015.447482 ;  message from S1 to C1  with remaining : 0.000000
+> [C1:slave:(2) 331.625739] [msg_test/INFO] WARNING FLOW[2] is limited by latency!!
 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3015.447482 ;  message from S1 to C1  with remaining : 0.000000
+> [C1:slave:(2) 331.625739] [msg_test/INFO] WARNING FLOW[3] is limited by latency!!
 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3015.447482 ;  message from S1 to C1  with remaining : 0.000000
 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[4] : 3015.447482 ;  message from C1 to S1  with remaining : 0.000000

diff --git a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh
index fa24ce6..180a522 100644 (file)
--- a/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh
+++ b/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh
@@ -14,6 +14,4 @@ $ gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename
 > [S2:master:(2) 0.342000] [msg_test/INFO] Completed peer: C2 time: 0.342000
 > [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[0] is limited by latency!!
 > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ;  message from S1 to C1  with remaining : 0.000000
-> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[1] is limited by latency!!
 > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ;  message from S2 to C2  with remaining : 0.000000
-

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index be6efd0..ca20efb 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -185,9 +185,7 @@ static link_CM02_im_t im_net_link_new(char *name,
 
   xbt_dict_set(surf_network_model->resource_set, name, nw_link,
                surf_resource_free);
-#ifdef HAVE_TRACING
-  TRACE_surf_link_declaration(nw_link, name, bw_initial, lat_initial);
-#endif
+
 
   return nw_link;
 }
@@ -558,7 +556,7 @@ static void im_net_update_resource_state(void *id,
                                 (nw_link->lmm_resource.power.peak *
                                  nw_link->lmm_resource.power.scale));
 #ifdef HAVE_TRACING
-    TRACE_surf_link_set_bandwidth(date, nw_link,
+    TRACE_surf_link_set_bandwidth(date, (char *)(((nw_link->lmm_resource).generic_resource).name),
                                   sg_bandwidth_factor *
                                   (nw_link->lmm_resource.power.peak *
                                    nw_link->lmm_resource.power.scale));
@@ -924,11 +922,11 @@ static void im_surf_network_model_init_internal(void)
 
   xbt_heap_set_update_callback(im_net_action_heap, im_net_action_update_index_heap);
 
-  routing_model_create(sizeof(link_CM02_im_t),
-                       (void *) im_net_link_new(xbt_strdup("__loopback__"),
-                                    498000000, NULL, 0.000015, NULL,
-                                    SURF_RESOURCE_ON, NULL,
-                                    SURF_LINK_FATPIPE, NULL));
+  routing_model_create(sizeof(link_CM02_im_t),        im_net_link_new(xbt_strdup("__loopback__"),
+                                                                      498000000, NULL, 0.000015, NULL,
+                                                                      SURF_RESOURCE_ON, NULL,
+                                                                      SURF_LINK_FATPIPE, NULL),
+                              im_net_get_link_latency);
   im_net_modified_set =
       xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
   keep_track = im_net_modified_set;