X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e1a18a0b8d75deb509860d08b75a27df4e935c8..1e5e4a470ede08f4055218978210e6c6e7fb751a:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index b1eab3a6e3..a4ef9bd464 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -13,43 +13,56 @@ namespace simgrid { namespace s4u { class As; class Host; + class Mailbox; + } + namespace simix { + class Synchro; } namespace surf { class Resource; class Cpu; - class NetCard; class Link; } + namespace routing { + class NetCard; + } namespace trace_mgr { class trace; class future_evt_set; } } -typedef simgrid::s4u::Host simgrid_Host; typedef simgrid::s4u::As simgrid_As; +typedef simgrid::s4u::Host simgrid_Host; +typedef simgrid::s4u::Mailbox simgrid_Mailbox; +typedef simgrid::simix::Synchro simix_Synchro; typedef simgrid::surf::Cpu surf_Cpu; -typedef simgrid::surf::NetCard surf_NetCard; +typedef simgrid::routing::NetCard routing_NetCard; typedef simgrid::surf::Link Link; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::trace_mgr::trace tmgr_Trace; #else -typedef struct simgrid_Host simgrid_Host; typedef struct simgrid_As simgrid_As; +typedef struct simgrid_Host simgrid_Host; +typedef struct simgrid_Mailbox simgrid_Mailbox; +typedef struct simix_Synchro simix_Synchro; typedef struct surf_Cpu surf_Cpu; -typedef struct surf_NetCard surf_NetCard; +typedef struct routing_NetCard routing_NetCard; typedef struct surf_Resource surf_Resource; typedef struct Link Link; typedef struct Trace tmgr_Trace; #endif -typedef simgrid_Host* sg_host_t; typedef simgrid_As *AS_t; +typedef simgrid_Host* sg_host_t; +typedef simgrid_Mailbox* sg_mbox_t; + +typedef simix_Synchro *smx_synchro_t; typedef surf_Cpu *surf_cpu_t; -typedef surf_NetCard *sg_netcard_t; +typedef routing_NetCard *sg_netcard_t; typedef surf_Resource *sg_resource_t; // Types which are in fact dictelmt: @@ -57,6 +70,9 @@ typedef struct s_xbt_dictelm *sg_storage_t; typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ +typedef struct s_smx_simcall s_smx_simcall_t; +typedef struct s_smx_simcall* smx_simcall_t; + typedef enum { SURF_LINK_FULLDUPLEX = 2, SURF_LINK_SHARED = 1,