X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db18cc7478c6fc7ce0d9e0c171b7fcb3cfc12491..5e2dd3ecf166c2d82974beb220aeb8dd4200f105:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 52e943c18e..56237db710 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -1,44 +1,41 @@
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef _SURF_NETWORK_PRIVATE_H
 #define _SURF_NETWORK_PRIVATE_H
 
 #include "surf_private.h"
+#include "xbt/dict.h"
 
-typedef enum {
-  SURF_NETWORK_LINK_ON = 1,		/* Ready        */
-  SURF_NETWORK_LINK_OFF = 0		/* Running      */
-} e_surf_network_link_state_t;
-
-typedef struct network_link {
-  surf_resource_t resource;   /* Any such object, added in a trace
-				 should start by this field!!! */
-                              /* Using this object with the public part of
-				 resource does not make sense */
-  const char *name;
-  xbt_maxmin_float_t bw_current;
-  tmgr_trace_event_t bw_event;
-  xbt_maxmin_float_t lat_current;
-  tmgr_trace_event_t lat_event;
-  e_surf_network_link_state_t state_current;
-  tmgr_trace_event_t state_event;
-  lmm_constraint_t constraint;
-} s_network_link_t, *network_link_t;
+typedef struct network_link_CM02 {
+  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 */
+  double lat_current;
+  tmgr_trace_event_t lat_event;
+} s_link_CM02_t, *link_CM02_t;
 
-typedef struct network_card {
-  const char *name;
-  int id;
-} s_network_card_t, *network_card_t;
 
-typedef struct surf_action_network {
+typedef struct surf_action_network_CM02 {
   s_surf_action_t generic_action;
+  double latency;
+  double lat_current;
+  double weight;
   lmm_variable_t variable;
-  network_card_t src;
-  network_card_t dst;
-} s_surf_action_network_t, *surf_action_network_t;
-
-#endif				/* _SURF_NETWORK_PRIVATE_H */
+  double rate;
+  int latency_limited;
+  int suspended;
+
+  int src;  /* saving source id for tracing */
+  int dst; /* saving dest id for tracing */
+  
+  char* src_name;  /* saving source id for tracing */ // ADDED BY DAVID
+  char* dst_name; /* saving dest id for tracing */ // ADDED BY DAVID
+  
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
+
+#endif /* _SURF_NETWORK_PRIVATE_H */