X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/527d6ea1ad739bddb768c4dc654085ddce6fe8bb..13fb4af932a02ea0bd4293d1e55ac071de326f80:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 334caa13b3..64730e0711 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,46 +9,45 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
+#include "xbt/base.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
-  namespace s4u {
-  class Actor;
+namespace kernel {
+namespace activity {
+  class ActivityImpl;
+  XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity);
+  XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity);
+}
+namespace routing {
+  class NetPoint;
+}
+}
+namespace simix {
   class Host;
-  class Link;
-  class Mailbox;
-  class NetZone;
-  }
-  namespace kernel {
-     namespace activity {
-       class ActivityImpl;
-     }
-     namespace routing {
-     class NetPoint;
-     }
-  }
-  namespace simix {
-    class Host;
-  }
-  namespace surf {
-    class Resource;
-    class Cpu;
-    class LinkImpl;
-    class HostImpl;
-  }
-  namespace trace_mgr {
-    class trace;
-    class future_evt_set;
-  }
+}
+namespace surf {
+  class Resource;
+  class Cpu;
+  class LinkImpl;
+  class HostImpl;
+  class StorageImpl;
+}
+namespace trace_mgr {
+  class trace;
+  class future_evt_set;
+}
 }
 
 typedef simgrid::s4u::Actor s4u_Actor;
 typedef simgrid::s4u::Host s4u_Host;
 typedef simgrid::s4u::Link s4u_Link;
+typedef simgrid::s4u::File s4u_File;
+typedef simgrid::s4u::Storage s4u_Storage;
 typedef simgrid::s4u::NetZone s4u_NetZone;
-typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
+typedef simgrid::kernel::activity::ActivityImpl* smx_activity_t;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
@@ -57,9 +56,10 @@ typedef simgrid::trace_mgr::trace tmgr_Trace;
 typedef struct s4u_Actor s4u_Actor;
 typedef struct s4u_Host s4u_Host;
 typedef struct s4u_Link s4u_Link;
+typedef struct s4u_File s4u_File;
+typedef struct s4u_Storage s4u_Storage;
 typedef struct s4u_NetZone s4u_NetZone;
-typedef struct kernel_Activity kernel_Activity;
-typedef struct surf_Cpu surf_Cpu;
+typedef struct kernel_Activity* smx_activity_t;
 typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
 typedef struct Trace tmgr_Trace;
@@ -69,16 +69,12 @@ typedef struct Trace tmgr_Trace;
 typedef s4u_NetZone* sg_netzone_t;
 typedef s4u_Host* sg_host_t;
 typedef s4u_Link* sg_link_t;
+typedef s4u_Storage* sg_storage_t;
+typedef s4u_File* sg_file_t;
 
-typedef kernel_Activity *smx_activity_t;
-
-typedef surf_Cpu *surf_cpu_t;
 typedef routing_NetPoint* sg_netpoint_t;
 typedef surf_Resource *sg_resource_t;
 
-// Types which are in fact dictelmt:
-typedef struct s_xbt_dictelm *sg_storage_t;
-
 typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
 
 typedef struct s_smx_simcall s_smx_simcall_t;
@@ -99,8 +95,8 @@ typedef enum {
 } e_surf_trace_connect_kind_t;
 
 typedef enum {
-  SURF_PROCESS_ON_FAILURE_DIE = 1,
-  SURF_PROCESS_ON_FAILURE_RESTART = 0
+  SURF_ACTOR_ON_FAILURE_DIE = 1,
+  SURF_ACTOR_ON_FAILURE_RESTART = 0
 } e_surf_process_on_failure_t;
 
 
@@ -114,4 +110,6 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
+typedef unsigned long aid_t;
+
 #endif