Merge branch 'clean_events' of github.com:Takishipp/simgrid into clean_events

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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index a4ef9bd..64730e0 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,65 +9,72 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
+#include "xbt/base.h"
+#include <boost/intrusive_ptr.hpp>
+
 namespace simgrid {
-  namespace s4u {
-    class As;
-    class Host;
-    class Mailbox;
-  }
-  namespace simix {
-    class Synchro;
-  }
-  namespace surf {
-    class Resource;
-    class Cpu;
-    class Link;
-  }
-  namespace routing {
-    class NetCard;
-  }    
-  namespace trace_mgr {
-    class trace;
-    class future_evt_set;
-  }
+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;
+}
+namespace surf {
+  class Resource;
+  class Cpu;
+  class LinkImpl;
+  class HostImpl;
+  class StorageImpl;
+}
+namespace trace_mgr {
+  class trace;
+  class future_evt_set;
+}
 }
 
-typedef simgrid::s4u::As simgrid_As;
-typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::s4u::Mailbox simgrid_Mailbox;
-typedef simgrid::simix::Synchro simix_Synchro;
-typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::routing::NetCard routing_NetCard;
-typedef simgrid::surf::Link Link;
+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* smx_activity_t;
+typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 #else
 
-typedef struct simgrid_As   simgrid_As;
-typedef struct simgrid_Host simgrid_Host;
-typedef struct simgrid_Mailbox simgrid_Mailbox;
-typedef struct simix_Synchro simix_Synchro;
-typedef struct surf_Cpu surf_Cpu;
-typedef struct routing_NetCard routing_NetCard;
+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* smx_activity_t;
+typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
-typedef struct Link Link;
 typedef struct Trace tmgr_Trace;
-#endif
 
-typedef simgrid_As *AS_t;
-typedef simgrid_Host* sg_host_t;
-typedef simgrid_Mailbox* sg_mbox_t;
+#endif
 
-typedef simix_Synchro *smx_synchro_t;
+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 surf_Cpu *surf_cpu_t;
-typedef routing_NetCard *sg_netcard_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;
@@ -88,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;
 
 
@@ -103,4 +110,6 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
+typedef unsigned long aid_t;
+
 #endif