-/* 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 struct surf_action_network {
+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 surf_action_network_CM02 {
s_surf_action_t generic_action;
+ double latency;
+ double lat_current;
+ double weight;
lmm_variable_t variable;
-} s_surf_action_network_t, *surf_action_network_t;
-
-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;
+ 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 */
+#endif /* _SURF_NETWORK_PRIVATE_H */
