-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. 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. */
#define _SURF_NETWORK_PRIVATE_H
#include "surf_private.h"
+#include "xbt/dict.h"
+#include "xbt/fifo.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_CM02 {
+ s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */
-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;
+ /* Using this object with the public part of
+ model does not make sense */
+ double 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_card {
- const char *name;
- int id;
-} s_network_card_t, *network_card_t;
-
-typedef struct surf_action_network {
- s_surf_action_t generic_action;
- xbt_heap_float_t latency;
- xbt_heap_float_t lat_current;
- 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 */
+} s_link_CM02_t, *link_CM02_t;
+
+typedef struct surf_action_network_CM02 {
+ s_surf_action_lmm_t generic_lmm_action;
+ double latency;
+ double lat_current;
+ double weight;
+ 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;
+#endif
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
+
+#endif /* _SURF_NETWORK_PRIVATE_H */
