[trace] tracing no longer needs src and dst for every network surf action

[simgrid.git] / src / surf / network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index ad2af8e..000acc7 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,9 +8,10 @@
 
 #include "surf_private.h"
 #include "xbt/dict.h"
+#include "xbt/fifo.h"
 
 typedef struct network_link_CM02 {
-  s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */
+  s_surf_resource_lmm_t lmm_resource;   /* must remain first to be added to a trace */
 
   /* Using this object with the public part of
      model does not make sense */
@@ -19,22 +19,21 @@ typedef struct network_link_CM02 {
   tmgr_trace_event_t lat_event;
 } s_link_CM02_t, *link_CM02_t;
 
-
 typedef struct surf_action_network_CM02 {
-  s_surf_action_t generic_action;
+  s_surf_action_lmm_t generic_lmm_action;
   double latency;
   double lat_current;
   double weight;
-  lmm_variable_t variable;
   double rate;
+  struct {
+     const char* link_name;
+     double gap;
+     double size;
+     xbt_fifo_item_t fifo_item;
+  } sender;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
   int latency_limited;
-  int suspended;
-
-#ifdef HAVE_TRACING
-  char* src_name;
-  char* dst_name;
 #endif
-  
 } s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
-#endif /* _SURF_NETWORK_PRIVATE_H */
+#endif                          /* _SURF_NETWORK_PRIVATE_H */