X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3d4c51aace6f9daab7ee7bf664d9d56c81070f8..39ba71a3e477b45dbb22e04f0d0b8c89f5772ff5:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 7851a6022e..19e0b5b3fe 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -6,26 +6,64 @@
 #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 Barrier;
+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;
+}
+
 namespace kernel {
 class EngineImpl;
-namespace context {
-class Context;
-class ContextFactory;
-}
+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;
@@ -41,6 +79,10 @@ namespace activity {
 
   class MailboxImpl;
 }
+namespace context {
+class Context;
+class ContextFactory;
+} // namespace context
 namespace lmm {
 class Element;
 class Variable;
@@ -52,7 +94,10 @@ namespace resource {
 class Action;
 class Model;
 class Resource;
+class NetworkModel;
 class TraceEvent;
+class LinkImpl;
+class NetworkAction;
 }
 namespace routing {
 class ClusterCreationArgs;
@@ -61,27 +106,34 @@ class NetPoint;
 class NetZoneImpl;
 class RouteCreationArgs;
 }
-}
+} // namespace kernel
 namespace simix {
-  class ActorImpl;
-  using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
   class Host;
 }
-
 namespace surf {
   class Cpu;
-  class LinkImpl;
+  class CpuModel;
   class HostImpl;
+  class HostModel;
   class StorageImpl;
   class StorageType;
+  class StorageModel;
+}
+namespace mc {
+class CommunicationDeterminismChecker;
 }
 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;
+typedef simgrid::s4u::Barrier s4u_Barrier;
 typedef simgrid::s4u::Host s4u_Host;
 typedef simgrid::s4u::Link s4u_Link;
 typedef simgrid::s4u::File s4u_File;
@@ -89,24 +141,19 @@ typedef simgrid::s4u::Storage s4u_Storage;
 typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::s4u::VirtualMachine s4u_VM;
 typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
-typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::kernel::resource::Resource surf_Resource;
-typedef simgrid::trace_mgr::trace tmgr_Trace;
+typedef simgrid::trace_mgr::trace* tmgr_trace_t;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
-typedef simgrid::simix::ActorImpl* smx_actor_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;
 
-typedef simgrid::kernel::lmm::Element* lmm_element_t;
-typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
-typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
-typedef simgrid::kernel::lmm::System* lmm_system_t;
-
 #else
 
 typedef struct s4u_Actor s4u_Actor;
+typedef struct s4u_Barrier s4u_Barrier;
 typedef struct s4u_Host s4u_Host;
 typedef struct s4u_Link s4u_Link;
 typedef struct s4u_File s4u_File;
@@ -114,18 +161,17 @@ typedef struct s4u_Storage s4u_Storage;
 typedef struct s4u_NetZone s4u_NetZone;
 typedef struct s4u_VM s4u_VM;
 typedef struct kernel_Activity* smx_activity_t;
-typedef struct routing_NetPoint routing_NetPoint;
-typedef struct surf_Resource surf_Resource;
-typedef struct Trace tmgr_Trace;
 
 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;
 
 #endif
 
+typedef s4u_Barrier* sg_bar_t;
 typedef s4u_NetZone* sg_netzone_t;
 typedef s4u_Host* sg_host_t;
 typedef s4u_Link* sg_link_t;
@@ -134,20 +180,8 @@ typedef s4u_File* sg_file_t;
 typedef s4u_VM* sg_vm_t;
 typedef s4u_Actor* sg_actor_t;
 
-typedef routing_NetPoint* sg_netpoint_t;
-typedef surf_Resource *sg_resource_t;
-
-typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
-
-typedef struct s_smx_simcall s_smx_simcall_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
  */