X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39ba71a3e477b45dbb22e04f0d0b8c89f5772ff5..18809c9eaf8282a515da08bda0a2065d362c5957:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 19e0b5b3fe..2ebb20b27d 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -16,32 +16,71 @@ namespace simgrid { namespace s4u { class Activity; + class Actor; -using ActorPtr = boost::intrusive_ptr; +/** Smart pointer to a simgrid::s4u::Actor */ +typedef boost::intrusive_ptr ActorPtr; XBT_PUBLIC void intrusive_ptr_release(Actor* actor); XBT_PUBLIC void intrusive_ptr_add_ref(Actor* actor); + class Barrier; +/** Smart pointer to a simgrid::s4u::Barrier */ +typedef boost::intrusive_ptr BarrierPtr; +XBT_PUBLIC void intrusive_ptr_release(Barrier* m); +XBT_PUBLIC void intrusive_ptr_add_ref(Barrier* m); + class Comm; -using CommPtr = boost::intrusive_ptr; +/** Smart pointer to a simgrid::s4u::Comm */ +typedef boost::intrusive_ptr CommPtr; XBT_PUBLIC void intrusive_ptr_release(Comm* c); XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c); + +class ConditionVariable; +/** Smart pointer to a simgrid::s4u::ConditionVariable */ +typedef boost::intrusive_ptr ConditionVariablePtr; +XBT_PUBLIC void intrusive_ptr_release(ConditionVariable* c); +XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariable* c); + class Engine; + class Exec; -using ExecPtr = boost::intrusive_ptr; +/** Smart pointer to a simgrid::s4u::Exec */ +typedef boost::intrusive_ptr ExecPtr; XBT_PUBLIC void intrusive_ptr_release(Exec* e); XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e); + class Host; + +class Io; +/** Smart pointer to a simgrid::s4u::Io */ +typedef boost::intrusive_ptr IoPtr; +XBT_PUBLIC void intrusive_ptr_release(Io* i); +XBT_PUBLIC void intrusive_ptr_add_ref(Io* i); + class Link; + class Mailbox; -using MailboxPtr = boost::intrusive_ptr; +/** Smart pointer to a simgrid::s4u::Mailbox */ +typedef boost::intrusive_ptr MailboxPtr; XBT_PUBLIC void intrusive_ptr_release(Mailbox* m); XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox* m); + class Mutex; XBT_PUBLIC void intrusive_ptr_release(Mutex* m); XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* m); +/** Smart pointer to a simgrid::s4u::Mutex */ +typedef boost::intrusive_ptr MutexPtr; + class NetZone; class VirtualMachine; class File; + +class Semaphore; +/** Smart pointer to a simgrid::s4u::Semaphore */ +typedef boost::intrusive_ptr SemaphorePtr; +XBT_PUBLIC void intrusive_ptr_release(Semaphore* m); +XBT_PUBLIC void intrusive_ptr_add_ref(Semaphore* m); + class Storage; } // namespace s4u @@ -53,29 +92,29 @@ namespace kernel { class EngineImpl; namespace actor { class ActorImpl; -using ActorImplPtr = boost::intrusive_ptr; +typedef boost::intrusive_ptr ActorImplPtr; } // namespace actor namespace activity { class ActivityImpl; - using ActivityImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr ActivityImplPtr; XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity); class ConditionVariableImpl; class CommImpl; - using CommImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr CommImplPtr; class ExecImpl; - using ExecImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr ExecImplPtr; class IoImpl; - using IoImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr IoImplPtr; class MutexImpl; - using MutexImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr MutexImplPtr; class RawImpl; - using RawImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr RawImplPtr; class SleepImpl; - using SleepImplPtr = boost::intrusive_ptr; + typedef boost::intrusive_ptr SleepImplPtr; class MailboxImpl; } @@ -137,6 +176,7 @@ typedef simgrid::s4u::Barrier s4u_Barrier; typedef simgrid::s4u::Host s4u_Host; typedef simgrid::s4u::Link s4u_Link; typedef simgrid::s4u::File s4u_File; +typedef simgrid::s4u::Semaphore s4u_Semaphore; typedef simgrid::s4u::Storage s4u_Storage; typedef simgrid::s4u::NetZone s4u_NetZone; typedef simgrid::s4u::VirtualMachine s4u_VM; @@ -148,7 +188,6 @@ typedef simgrid::kernel::actor::ActorImpl* smx_actor_t; typedef simgrid::kernel::activity::ConditionVariableImpl* smx_cond_t; typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t; typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; -typedef simgrid::surf::StorageImpl* surf_storage_t; #else @@ -157,6 +196,7 @@ typedef struct s4u_Barrier s4u_Barrier; typedef struct s4u_Host s4u_Host; typedef struct s4u_Link s4u_Link; typedef struct s4u_File s4u_File; +typedef struct s4u_Semaphore s4u_Semaphore; typedef struct s4u_Storage s4u_Storage; typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; @@ -167,11 +207,11 @@ typedef struct s_smx_actor* smx_actor_t; typedef struct s_smx_cond_t* smx_cond_t; typedef struct s_smx_mutex* smx_mutex_t; typedef struct s_smx_mailbox* smx_mailbox_t; -typedef struct s_surf_storage* surf_storage_t; #endif typedef s4u_Barrier* sg_bar_t; +typedef s4u_Semaphore* sg_sem_t; typedef s4u_NetZone* sg_netzone_t; typedef s4u_Host* sg_host_t; typedef s4u_Link* sg_link_t; @@ -192,6 +232,7 @@ typedef unsigned long long sg_size_t; */ typedef long long sg_offset_t; +/** Actor's ID, just like the classical processes' have PID in UNIX */ typedef long aid_t; #endif /* SIMGRID_TYPES_H */