X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d97620ce7ee1b0408e879c285eb837aca02a749..361efa3e8f2dc2433b19efa0e40049350d2c9f43:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 3776800807..8d8aefd3f6 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef SG_PLATF_TYPES_H -#define SG_PLATF_TYPES_H +#ifndef SIMGRID_TYPES_H +#define SIMGRID_TYPES_H #ifdef __cplusplus @@ -15,6 +14,10 @@ namespace simgrid { namespace kernel { +namespace context { +class Context; +class ContextFactory; +} namespace activity { class ActivityImpl; using ActivityImplPtr = boost::intrusive_ptr; @@ -31,7 +34,10 @@ namespace activity { using RawImplPtr = boost::intrusive_ptr; class SleepImpl; using SleepImplPtr = boost::intrusive_ptr; + + class MailboxImpl; } + namespace routing { class NetPoint; } @@ -40,6 +46,8 @@ namespace simix { class ActorImpl; using ActorImplPtr = boost::intrusive_ptr; class Host; + + class MutexImpl; } namespace surf { class Resource; @@ -66,6 +74,12 @@ typedef simgrid::kernel::routing::NetPoint routing_NetPoint; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::trace_mgr::trace tmgr_Trace; +typedef simgrid::kernel::context::Context* smx_context_t; +typedef simgrid::simix::ActorImpl* smx_actor_t; +typedef simgrid::simix::MutexImpl* smx_mutex_t; +typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; +typedef simgrid::surf::FileImpl* surf_file_t; + #else typedef struct s4u_Actor s4u_Actor; @@ -79,6 +93,11 @@ typedef struct routing_NetPoint routing_NetPoint; typedef struct surf_Resource surf_Resource; typedef struct Trace tmgr_Trace; +typedef struct s_smx_context* smx_context_t; +typedef struct s_smx_actor* smx_actor_t; +typedef struct s_smx_mutex* smx_mutex_t; +typedef struct s_smx_mailbox* smx_mailbox_t; + #endif typedef s4u_NetZone* sg_netzone_t; @@ -127,4 +146,4 @@ typedef long long sg_offset_t; typedef unsigned long aid_t; -#endif +#endif /* SIMGRID_TYPES_H */