X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd7651841882fc2795ff07da448a240dbdc90220..38f7ddbf61f574a934f191ef2d8358d9f8be1f96:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index edfca2e874..96e8194eac 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -17,14 +17,28 @@ namespace simgrid { namespace kernel { namespace activity { class ActivityImpl; + using ActivityImplPtr = boost::intrusive_ptr; XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity); XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity); + + class CommImpl; + using CommImplPtr = boost::intrusive_ptr; + class ExecImpl; + using ExecImplPtr = boost::intrusive_ptr; + class IoImpl; + using IoImplPtr = boost::intrusive_ptr; + class RawImpl; + using RawImplPtr = boost::intrusive_ptr; + class SleepImpl; + using SleepImplPtr = boost::intrusive_ptr; } namespace routing { class NetPoint; } } namespace simix { + class ActorImpl; + using ActorImplPtr = boost::intrusive_ptr; class Host; } namespace surf { @@ -43,9 +57,10 @@ namespace trace_mgr { typedef simgrid::s4u::Actor s4u_Actor; typedef simgrid::s4u::Host s4u_Host; typedef simgrid::s4u::Link s4u_Link; +typedef simgrid::s4u::File s4u_File; typedef simgrid::s4u::Storage s4u_Storage; typedef simgrid::s4u::NetZone s4u_NetZone; -typedef simgrid::kernel::activity::ActivityImpl* smx_activity_t; +typedef boost::intrusive_ptr smx_activity_t; typedef simgrid::kernel::routing::NetPoint routing_NetPoint; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::trace_mgr::trace tmgr_Trace; @@ -55,6 +70,7 @@ typedef simgrid::trace_mgr::trace tmgr_Trace; typedef struct s4u_Actor s4u_Actor; typedef struct s4u_Host s4u_Host; typedef struct s4u_Link s4u_Link; +typedef struct s4u_File s4u_File; typedef struct s4u_Storage s4u_Storage; typedef struct s4u_NetZone s4u_NetZone; typedef struct kernel_Activity* smx_activity_t; @@ -68,6 +84,7 @@ typedef s4u_NetZone* sg_netzone_t; typedef s4u_Host* sg_host_t; typedef s4u_Link* sg_link_t; typedef s4u_Storage* sg_storage_t; +typedef s4u_File* sg_file_t; typedef routing_NetPoint* sg_netpoint_t; typedef surf_Resource *sg_resource_t;