make it possible to return intrusive_ptr in simcalls

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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 334caa1..a387d1c 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,22 +9,19 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
+#include "xbt/base.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
-  namespace s4u {
-  class Actor;
-  class Host;
-  class Link;
-  class Mailbox;
-  class NetZone;
-  }
-  namespace kernel {
-     namespace activity {
-       class ActivityImpl;
-     }
-     namespace routing {
-     class NetPoint;
+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 {
@@ -35,6 +32,7 @@ namespace simgrid {
     class Cpu;
     class LinkImpl;
     class HostImpl;
+    class StorageImpl;
   }
   namespace trace_mgr {
     class trace;
@@ -48,7 +46,6 @@ typedef simgrid::s4u::Link s4u_Link;
 typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
 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;
 
@@ -59,7 +56,6 @@ typedef struct s4u_Host s4u_Host;
 typedef struct s4u_Link s4u_Link;
 typedef struct s4u_NetZone s4u_NetZone;
 typedef struct kernel_Activity kernel_Activity;
-typedef struct surf_Cpu surf_Cpu;
 typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
 typedef struct Trace tmgr_Trace;
@@ -72,7 +68,6 @@ typedef s4u_Link* sg_link_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;
 
@@ -99,8 +94,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 +109,6 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
+typedef unsigned long aid_t;
+
 #endif