X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/080541387d2296c808397215b8c9401a9f97a1d5..eaacbb174d19fe490b8243e2675e5e3b7cbb62de:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 7bfb4f4e1c..dae9277459 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. 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. */ @@ -115,7 +115,10 @@ using ActorCode = std::function; // Create an ActorCode from the parameters parsed in the XML file (or elsewhere) using ActorCodeFactory = std::function args)>; +class Simcall; class SimcallObserver; +class ObjectAccessSimcallObserver; +class ObjectAccessSimcallItem; } // namespace actor namespace activity { @@ -182,7 +185,6 @@ class CpuModel; class HostImpl; class HostModel; class NetworkModel; -class NetworkModelIntf; class LinkImpl; class StandardLinkImpl; class SplitDuplexLinkImpl; @@ -205,11 +207,9 @@ class FutureEvtSet; class Profile; } // namespace profile } // namespace kernel -namespace simix { -class Simcall; -} namespace mc { class State; +class RemoteApp; } } // namespace simgrid @@ -228,13 +228,19 @@ using s4u_Disk = simgrid::s4u::Disk; using s4u_NetZone = simgrid::s4u::NetZone; using s4u_VM = simgrid::s4u::VirtualMachine; -using smx_timer_t = simgrid::kernel::timer::Timer*; -using smx_actor_t = simgrid::kernel::actor::ActorImpl*; +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 = 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 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; @@ -252,13 +258,13 @@ typedef struct s4u_Disk s4u_Disk; typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; -typedef struct s_smx_timer* smx_timer_t; -typedef struct s_smx_actor* smx_actor_t; +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; -typedef struct s_smx_cond_t* smx_cond_t; -typedef struct s_smx_mailbox* smx_mailbox_t; -typedef struct s_smx_mutex* smx_mutex_t; -typedef struct s_smx_sem* smx_sem_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 @@ -311,13 +317,15 @@ typedef long long sg_offset_t; typedef long aid_t; typedef enum { - SG_OK, - SG_ERROR_CANCELED, - SG_ERROR_TIMEOUT, - SG_ERROR_HOST, - SG_ERROR_NETWORK, - SG_ERROR_STORAGE, - SG_ERROR_VM + SG_OK /** Code returned when no problem occured */, + SG_ERROR_CANCELED /** Code returned when something got canceled before completion */, + SG_ERROR_TIMEOUT /** Code returned when timeout elapsed */, + SG_ERROR_HOST /** Code returned when a host fails */, + SG_ERROR_NETWORK /** Code returned when a communication fails because of the network or because of the remote host */, + SG_ERROR_STORAGE /** Code returned when a storage fails */, + SG_ERROR_VM /** Code returned when a VM fails */ } sg_error_t; +XBT_PUBLIC int SMPI_is_inited(); + #endif /* SIMGRID_TYPES_H */