X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8ef16dfe15a51e315150b693b11f80f23b1d5af..a707ad979be7c88d7581f403661c67598d320d55:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 18368a6da9..884aa660ad 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. 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. */ @@ -66,6 +66,7 @@ XBT_PUBLIC void intrusive_ptr_release(Io* i); XBT_PUBLIC void intrusive_ptr_add_ref(Io* i); class Link; +class SplitDuplexLink; class Mailbox; @@ -90,6 +91,13 @@ XBT_PUBLIC void intrusive_ptr_release(const Semaphore* m); XBT_PUBLIC void intrusive_ptr_add_ref(const Semaphore* m); class Disk; +/** + * @brief Callback to dynamically change the resource's capacity + * + * Allows user to change resource's capacity depending on the number of concurrent activities + * running on the resource at a given instant + */ +using NonLinearResourceCb = std::function; } // namespace s4u namespace config { @@ -117,6 +125,13 @@ namespace activity { XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity); + class BarrierImpl; + using BarrierImplPtr = boost::intrusive_ptr; + XBT_PUBLIC void intrusive_ptr_add_ref(BarrierImpl* cond); + XBT_PUBLIC void intrusive_ptr_release(BarrierImpl* cond); + class BarrierAcquisitionImpl; + using BarrierAcquisitionImplPtr = boost::intrusive_ptr; + class ConditionVariableImpl; using ConditionVariableImplPtr = boost::intrusive_ptr; XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariableImpl* cond); @@ -130,12 +145,16 @@ namespace activity { using IoImplPtr = boost::intrusive_ptr; class MutexImpl; using MutexImplPtr = boost::intrusive_ptr; + class MutexAcquisitionImpl; + using MutexAcquisitionImplPtr = boost::intrusive_ptr; XBT_PUBLIC void intrusive_ptr_add_ref(MutexImpl* mutex); XBT_PUBLIC void intrusive_ptr_release(MutexImpl* mutex); - class RawImpl; - using RawImplPtr = boost::intrusive_ptr; + class SynchroImpl; + using SynchroImplPtr = boost::intrusive_ptr; class SemaphoreImpl; using SemaphoreImplPtr = boost::intrusive_ptr; + class SemAcquisitionImpl; + using SemAcquisitionImplPtr = boost::intrusive_ptr; XBT_PUBLIC void intrusive_ptr_add_ref(SemaphoreImpl* sem); XBT_PUBLIC void intrusive_ptr_release(SemaphoreImpl* sem); class SleepImpl; @@ -160,11 +179,21 @@ class CpuImpl; class Model; class Resource; class CpuModel; +class HostImpl; +class HostModel; class NetworkModel; +class NetworkModelIntf; class LinkImpl; +class StandardLinkImpl; +class SplitDuplexLinkImpl; class NetworkAction; class DiskImpl; class DiskModel; +class VirtualMachineImpl; +class VMModel; +} +namespace timer { +class Timer; } namespace routing { class NetPoint; @@ -176,21 +205,9 @@ class FutureEvtSet; class Profile; } // namespace profile } // namespace kernel -namespace simix { - class Host; - class Timer; -} -namespace surf { - class HostImpl; - class HostModel; -} namespace mc { -class CommunicationDeterminismChecker; +class State; } -namespace vm { -class VMModel; -class VirtualMachineImpl; -} // namespace vm } // namespace simgrid using s4u_Actor = simgrid::s4u::Actor; @@ -208,14 +225,13 @@ using s4u_Disk = simgrid::s4u::Disk; using s4u_NetZone = simgrid::s4u::NetZone; using s4u_VM = simgrid::s4u::VirtualMachine; -using smx_timer_t = simgrid::simix::Timer*; +using smx_timer_t = simgrid::kernel::timer::Timer*; using smx_actor_t = simgrid::kernel::actor::ActorImpl*; using smx_activity_t = simgrid::kernel::activity::ActivityImpl*; using smx_cond_t = simgrid::kernel::activity::ConditionVariableImpl*; using smx_mailbox_t = simgrid::kernel::activity::MailboxImpl*; using smx_mutex_t = simgrid::kernel::activity::MutexImpl*; using smx_sem_t = simgrid::kernel::activity::SemaphoreImpl*; -using e_smx_state_t XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") = simgrid::kernel::activity::State; #else typedef struct s4u_Actor s4u_Actor; @@ -232,7 +248,6 @@ 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_v330("Please stop using this type alias") typedef enum kernel_activity_state e_smx_state_t; typedef struct s_smx_timer* smx_timer_t; typedef struct s_smx_actor* smx_actor_t; @@ -247,9 +262,9 @@ typedef struct s_smx_sem* smx_sem_t; /** Pointer to a SimGrid barrier object */ typedef s4u_Barrier* sg_bar_t; /** Constant pointer to a SimGrid barrier object */ -typedef const s4u_Barrier* const_sg_bar_t; +XBT_ATTRIB_DEPRECATED_v335("Please stop using this type alias") typedef const s4u_Barrier* const_sg_bar_t; typedef s4u_Comm* sg_comm_t; -typedef const s4u_Comm* const_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; @@ -268,13 +283,15 @@ typedef s4u_Link* sg_link_t; typedef const s4u_Link* const_sg_link_t; typedef s4u_Disk* sg_disk_t; typedef const s4u_Disk* const_sg_disk_t; -/** Pointer to a SimGrid file object */ +/** Pointer to a SimGrid file object @ingroup plugin_filesystem */ typedef s4u_File* sg_file_t; -/** Constant pointer to a SimGrid file object */ +/** Constant pointer to a SimGrid file object @ingroup plugin_filesystem */ typedef const s4u_File* const_sg_file_t; typedef s4u_VM* sg_vm_t; typedef const s4u_VM* const_sg_vm_t; +/** Pointer to an actor object */ typedef s4u_Actor* sg_actor_t; +/** Pointer to a constant actor object */ typedef const s4u_Actor* const_sg_actor_t; typedef struct s_smx_simcall* smx_simcall_t;