Reduce the foreign usages of s4u::Host::pimpl_cpu, which should be private

[simgrid.git] / include / simgrid / forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 11b07d2..4ce7e57 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -6,14 +6,44 @@
 #ifndef SIMGRID_TYPES_H
 #define SIMGRID_TYPES_H
 
-#ifdef __cplusplus
-
-#include <simgrid/s4u/forward.hpp>
 #include <xbt/base.h>
 
+#ifdef __cplusplus
+
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
+
+namespace s4u {
+class Activity;
+class Actor;
+using ActorPtr = boost::intrusive_ptr<Actor>;
+XBT_PUBLIC void intrusive_ptr_release(Actor* actor);
+XBT_PUBLIC void intrusive_ptr_add_ref(Actor* actor);
+class Comm;
+using CommPtr = boost::intrusive_ptr<Comm>;
+XBT_PUBLIC void intrusive_ptr_release(Comm* c);
+XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c);
+class Engine;
+class Exec;
+using ExecPtr = boost::intrusive_ptr<Exec>;
+XBT_PUBLIC void intrusive_ptr_release(Exec* e);
+XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
+class Host;
+class Link;
+class Mailbox;
+using MailboxPtr = boost::intrusive_ptr<Mailbox>;
+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);
+class NetZone;
+class VirtualMachine;
+class File;
+class Storage;
+} // namespace s4u
+
 namespace config {
 template <class T> class Flag;
 }
@@ -24,12 +54,15 @@ namespace actor {
 class ActorImpl;
 using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
 } // namespace actor
+
 namespace activity {
   class ActivityImpl;
   using ActivityImplPtr = boost::intrusive_ptr<ActivityImpl>;
   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<CommImpl>;
   class ExecImpl;
@@ -88,6 +121,10 @@ namespace trace_mgr {
   class trace;
   class future_evt_set;
 }
+namespace vm {
+class VMModel;
+class VirtualMachineImpl;
+} // namespace vm
 } // namespace simgrid
 
 typedef simgrid::s4u::Actor s4u_Actor;
@@ -102,6 +139,7 @@ typedef simgrid::trace_mgr::trace* tmgr_trace_t;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
 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;
@@ -119,6 +157,7 @@ typedef struct kernel_Activity* smx_activity_t;
 
 typedef struct s_smx_context* smx_context_t;
 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;
@@ -135,12 +174,6 @@ typedef s4u_Actor* sg_actor_t;
 
 typedef struct s_smx_simcall* smx_simcall_t;
 
-typedef enum { // FIXME: move this to s4u::Link; make it an enum class
-  SURF_LINK_SPLITDUPLEX = 2,
-  SURF_LINK_SHARED      = 1,
-  SURF_LINK_FATPIPE     = 0
-} e_surf_link_sharing_policy_t;
-
 /** @ingroup m_datatypes_management_details
  * @brief Type for any simgrid size
  */