X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6eb772e45cc853fc204bb5aebeb411cdfa7c929..365a83d3a1407923acccab758f9225e11408b5c6:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index dae9277459..e2a0606227 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -19,8 +19,14 @@ namespace s4u { class Activity; /** Smart pointer to a simgrid::s4u::Activity */ using ActivityPtr = boost::intrusive_ptr; -XBT_PUBLIC void intrusive_ptr_release(const Activity* actor); -XBT_PUBLIC void intrusive_ptr_add_ref(const Activity* actor); +XBT_PUBLIC void intrusive_ptr_release(const Activity* act); +XBT_PUBLIC void intrusive_ptr_add_ref(const Activity* act); + +class ActivitySet; +/** Smart pointer to a simgrid::s4u::Activity */ +using ActivitySetPtr = boost::intrusive_ptr; +XBT_PUBLIC void intrusive_ptr_release(const ActivitySet* as); +XBT_PUBLIC void intrusive_ptr_add_ref(const ActivitySet* as); class Actor; /** Smart pointer to a simgrid::s4u::Actor */ @@ -31,8 +37,8 @@ XBT_PUBLIC void intrusive_ptr_add_ref(const Actor* actor); class Barrier; /** Smart pointer to a simgrid::s4u::Barrier */ using BarrierPtr = boost::intrusive_ptr; -XBT_PUBLIC void intrusive_ptr_release(Barrier* m); -XBT_PUBLIC void intrusive_ptr_add_ref(Barrier* m); +XBT_PUBLIC void intrusive_ptr_release(Barrier* b); +XBT_PUBLIC void intrusive_ptr_add_ref(Barrier* b); class Comm; /** Smart pointer to a simgrid::s4u::Comm */ @@ -70,6 +76,14 @@ class SplitDuplexLink; class Mailbox; +class Mess; +/** Smart pointer to a simgrid::s4u::Mess */ +using MessPtr = boost::intrusive_ptr; +XBT_PUBLIC void intrusive_ptr_release(Mess* c); +XBT_PUBLIC void intrusive_ptr_add_ref(Mess* c); + +class MessageQueue; + class Mutex; XBT_PUBLIC void intrusive_ptr_release(const Mutex* m); XBT_PUBLIC void intrusive_ptr_add_ref(const Mutex* m); @@ -91,6 +105,19 @@ XBT_PUBLIC void intrusive_ptr_release(const Semaphore* m); XBT_PUBLIC void intrusive_ptr_add_ref(const Semaphore* m); class Disk; + +class Task; +/** Smart pointer to a simgrid::s4u::Task */ +using TaskPtr = boost::intrusive_ptr; +XBT_PUBLIC void intrusive_ptr_release(Task* o); +XBT_PUBLIC void intrusive_ptr_add_ref(Task* o); +class ExecTask; +using ExecTaskPtr = boost::intrusive_ptr; +class CommTask; +using CommTaskPtr = boost::intrusive_ptr; +class IoTask; +using IoTaskPtr = boost::intrusive_ptr; + /** * @brief Callback to dynamically change the resource's capacity * @@ -117,6 +144,8 @@ using ActorCodeFactory = std::function args)> class Simcall; class SimcallObserver; +class MutexObserver; +class ConditionVariableObserver; class ObjectAccessSimcallObserver; class ObjectAccessSimcallItem; } // namespace actor @@ -139,6 +168,8 @@ namespace activity { using ConditionVariableImplPtr = boost::intrusive_ptr; XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariableImpl* cond); XBT_PUBLIC void intrusive_ptr_release(ConditionVariableImpl* cond); + class ConditionVariableAcquisitionImpl; + using ConditionVariableAcquisitionImplPtr = boost::intrusive_ptr; class CommImpl; using CommImplPtr = boost::intrusive_ptr; @@ -146,6 +177,8 @@ namespace activity { using ExecImplPtr = boost::intrusive_ptr; class IoImpl; using IoImplPtr = boost::intrusive_ptr; + class MessImpl; + using MessImplPtr = boost::intrusive_ptr; class MutexImpl; using MutexImplPtr = boost::intrusive_ptr; class MutexAcquisitionImpl; @@ -164,6 +197,7 @@ namespace activity { using SleepImplPtr = boost::intrusive_ptr; class MailboxImpl; + class MessageQueueImpl; } namespace context { class Context; @@ -178,6 +212,7 @@ class System; } namespace resource { class Action; +class CpuAction; class CpuImpl; class Model; class Resource; @@ -190,6 +225,7 @@ class StandardLinkImpl; class SplitDuplexLinkImpl; class NetworkAction; class DiskImpl; +using DiskImplPtr = boost::intrusive_ptr; class DiskModel; class VirtualMachineImpl; class VMModel; @@ -214,6 +250,8 @@ class RemoteApp; } // namespace simgrid using s4u_Actor = simgrid::s4u::Actor; +using s4u_Activity = simgrid::s4u::Activity; +using s4u_ActivitySet = simgrid::s4u::ActivitySet; using s4u_Barrier = simgrid::s4u::Barrier; using s4u_Comm = simgrid::s4u::Comm; using s4u_Exec = simgrid::s4u::Exec; @@ -222,28 +260,19 @@ using s4u_Link = simgrid::s4u::Link; using s4u_File = simgrid::s4u::File; using s4u_ConditionVariable = simgrid::s4u::ConditionVariable; using s4u_Mailbox = simgrid::s4u::Mailbox; +using s4u_MessageQueue = simgrid::s4u::MessageQueue; using s4u_Mutex = simgrid::s4u::Mutex; using s4u_Semaphore = simgrid::s4u::Semaphore; using s4u_Disk = simgrid::s4u::Disk; using s4u_NetZone = simgrid::s4u::NetZone; using s4u_VM = simgrid::s4u::VirtualMachine; -using smx_timer_t - XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::timer::Timer*") = simgrid::kernel::timer::Timer*; -using smx_actor_t - XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::actor::ActorImpl*") = simgrid::kernel::actor::ActorImpl*; using smx_activity_t = simgrid::kernel::activity::ActivityImpl*; -using smx_cond_t XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::activity::ConditionVariableImpl*") = - simgrid::kernel::activity::ConditionVariableImpl*; -using smx_mailbox_t XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::activity::MailboxImpl*") = - simgrid::kernel::activity::MailboxImpl*; -using smx_mutex_t XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::activity::MutexImpl*") = - simgrid::kernel::activity::MutexImpl*; -using smx_sem_t XBT_ATTRIB_DEPRECATED_v335("Please use simgrid::kernel::activity::SemaphoreImpl*") = - simgrid::kernel::activity::SemaphoreImpl*; #else typedef struct s4u_Actor s4u_Actor; +typedef struct s4u_Activity s4u_Activity; +typedef struct s4u_ActivitySet s4u_ActivitySet; typedef struct s4u_Barrier s4u_Barrier; typedef struct s4u_Comm s4u_Comm; typedef struct s4u_Exec s4u_Exec; @@ -252,34 +281,28 @@ typedef struct s4u_Link s4u_Link; typedef struct s4u_File s4u_File; typedef struct s4u_ConditionVariable s4u_ConditionVariable; typedef struct s4u_Mailbox s4u_Mailbox; +typedef struct s4u_MessageQueue s4u_MessageQueue; typedef struct s4u_Mutex s4u_Mutex; typedef struct s4u_Semaphore s4u_Semaphore; typedef struct s4u_Disk s4u_Disk; typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_timer* smx_timer_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_actor* smx_actor_t; typedef struct s_smx_activity* smx_activity_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_cond_t* smx_cond_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_mailbox* smx_mailbox_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_mutex* smx_mutex_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef struct s_smx_sem* smx_sem_t; #endif /** Pointer to a SimGrid barrier object */ typedef s4u_Barrier* sg_bar_t; -/** Constant pointer to a SimGrid barrier object */ -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef const s4u_Barrier* const_sg_bar_t; typedef s4u_Comm* sg_comm_t; -XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef const s4u_Comm* const_sg_comm_t; typedef s4u_Exec* sg_exec_t; typedef const s4u_Exec* const_sg_exec_t; typedef s4u_ConditionVariable* sg_cond_t; typedef const s4u_ConditionVariable* const_sg_cond_t; typedef s4u_Mailbox* sg_mailbox_t; typedef const s4u_Mailbox* const_sg_mailbox_t; +typedef s4u_MessageQueue* sg_messagequeue_t; +typedef const s4u_MessageQueue* const_sg_messagequeue_t; typedef s4u_Mutex* sg_mutex_t; typedef const s4u_Mutex* const_sg_mutex_t; typedef s4u_Semaphore* sg_sem_t; @@ -303,13 +326,23 @@ typedef s4u_Actor* sg_actor_t; /** Pointer to a constant actor object */ typedef const s4u_Actor* const_sg_actor_t; +/** Pointer to an activity object */ +typedef s4u_Activity* sg_activity_t; +/** Pointer to a constant activity object */ +typedef const s4u_Activity* const_sg_activity_t; + +/** Pointer to an activity set object */ +typedef s4u_ActivitySet* sg_activity_set_t; +/** Pointer to a constant activity set object */ +typedef const s4u_ActivitySet* const_sg_activity_set_t; + /** @ingroup m_datatypes_management_details - * @brief Type for any simgrid size + * @brief Type for any SimGrid size */ typedef unsigned long long sg_size_t; /** @ingroup m_datatypes_management_details - * @brief Type for any simgrid offset + * @brief Type for any SimGrid offset */ typedef long long sg_offset_t;