Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Further work on objectification of resources: use s_surf_resource_lmm_t in s_link_CM02_t
[simgrid.git] / src / surf / network_private.h
index 0f58113..7120d46 100644 (file)
@@ -1,23 +1,39 @@
-/* Authors: Arnaud Legrand                                                  */
+/*     $Id$     */
+
+/* Copyright (c) 2004 Arnaud Legrand. 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 "network_common.h"
+#include "xbt/dict.h"
 
-typedef struct surf_action_network {
-  s_surf_action_t generic_action;
-  lmm_variable_t variable;
-} s_surf_action_network_t, *surf_action_network_t;
+typedef struct network_link_CM02 {
+  s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */
 
-typedef struct network {
-  surf_resource_t resource;   /* Any such object, added in a trace
-                                should start by this field!!! */
-  const char *name;
-} s_network_t, *network_t;
+  /* 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;
 
 
-#endif                         /* _SURF_NETWORK_PRIVATE_H */
+typedef struct surf_action_network_CM02 {
+  s_surf_action_t generic_action;
+  double latency;
+  double lat_current;
+  double weight;
+  lmm_variable_t variable;
+  double rate;
+  int suspended;
+#ifdef KILLME
+  int src;
+  int dst;
+#endif
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
+
+#endif /* _SURF_NETWORK_PRIVATE_H */