X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d2a13920d14e66444673693fc6f9694247e41e9..8fef98ecb9454a54f606551e8d9a2e3a95259b42:/src/surf/network_private.h diff --git a/src/surf/network_private.h b/src/surf/network_private.h index 68dfe46828..e9c56fb860 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -20,20 +20,11 @@ typedef struct network_link_CM02 { tmgr_trace_event_t lat_event; } s_link_CM02_t, *link_CM02_t; -enum heap_action_type{ - LATENCY = 100, - MAX_DURATION, - NORMAL, - NOTSET -}; - typedef struct surf_action_network_CM02 { - s_surf_action_t generic_action; - s_xbt_swag_hookup_t action_list_hookup; + s_surf_action_lmm_t generic_lmm_action; double latency; double lat_current; double weight; - lmm_variable_t variable; double rate; struct { const char* link_name; @@ -44,14 +35,6 @@ typedef struct surf_action_network_CM02 { #ifdef HAVE_LATENCY_BOUND_TRACKING int latency_limited; #endif - int suspended; -#ifdef HAVE_TRACING - char *src_name; - char *dst_name; -#endif - int index_heap; - enum heap_action_type hat; - double last_update; } s_surf_action_network_CM02_t, *surf_action_network_CM02_t; #endif /* _SURF_NETWORK_PRIVATE_H */