X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78fee3006db95dc64540374a81299f6c9f01ac4a..28700bafbbef119ee34d7632ed7c61749995dc78:/src/surf/network_private.h diff --git a/src/surf/network_private.h b/src/surf/network_private.h index d57d9cecff..000acc7721 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -1,6 +1,4 @@ -/* $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. */ @@ -10,9 +8,10 @@ #include "surf_private.h" #include "xbt/dict.h" +#include "xbt/fifo.h" typedef struct network_link_CM02 { - s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */ + 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 */ @@ -20,15 +19,21 @@ typedef struct network_link_CM02 { 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; + s_surf_action_lmm_t generic_lmm_action; double latency; double lat_current; double weight; - lmm_variable_t variable; double rate; - int suspended; + 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 */ +#endif /* _SURF_NETWORK_PRIVATE_H */