Group fields together. They will be soon refactored elsewhere.

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

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index d67fc61..0d1fc19 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -27,33 +27,29 @@ enum heap_action_type{
   NOTSET
 };
 
-typedef struct surf_action_network_CM02_im {
-  s_surf_action_t generic_action;
+typedef struct surf_action_network_CM02 {
+  s_surf_action_lmm_t generic_lmm_action;
   s_xbt_swag_hookup_t action_list_hookup;
+  int index_heap;
+  double last_update;
+  enum heap_action_type hat;
   double latency;
   double lat_current;
   double weight;
-  lmm_variable_t variable;
   double rate;
-#ifdef HAVE_SMPI
   struct {
      const char* link_name;
      double gap;
      double size;
      xbt_fifo_item_t fifo_item;
   } sender;
-#endif
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int latency_limited;
 #endif
-  int suspended;
 #ifdef HAVE_TRACING
   char *src_name;
   char *dst_name;
 #endif
-  int index_heap;
-  enum heap_action_type hat;
-  double last_update;
-} s_surf_action_network_CM02_im_t, *surf_action_network_CM02_im_t;
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
 #endif                          /* _SURF_NETWORK_PRIVATE_H */