A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[s4u] add Actor::getPPid and this_actor::getPPid()
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
a4ef9bd
..
83d437a
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-9,23
+9,27
@@
#ifdef __cplusplus
#ifdef __cplusplus
+#include <boost/intrusive_ptr.hpp>
+
namespace simgrid {
namespace s4u {
class As;
class Host;
class Mailbox;
}
namespace simgrid {
namespace s4u {
class As;
class Host;
class Mailbox;
}
- namespace simix {
- class Synchro;
+ namespace kernel {
+ namespace activity {
+ class ActivityImpl;
+ }
+ namespace routing {
+ class NetCard;
+ }
}
namespace surf {
class Resource;
class Cpu;
class Link;
}
}
namespace surf {
class Resource;
class Cpu;
class Link;
}
- namespace routing {
- class NetCard;
- }
namespace trace_mgr {
class trace;
class future_evt_set;
namespace trace_mgr {
class trace;
class future_evt_set;
@@
-34,10
+38,10
@@
namespace simgrid {
typedef simgrid::s4u::As simgrid_As;
typedef simgrid::s4u::Host simgrid_Host;
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 boost::intrusive_ptr<simgrid::s4u::Mailbox> sg_mbox_t;
+typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
+typedef simgrid::kernel::routing::NetCard routing_NetCard;
typedef simgrid::surf::Cpu surf_Cpu;
typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::routing::NetCard routing_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
@@
-46,8
+50,8
@@
typedef simgrid::trace_mgr::trace tmgr_Trace;
typedef struct simgrid_As simgrid_As;
typedef struct simgrid_Host simgrid_Host;
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 simgrid_Mailbox
*sg_mbox_t
;
+typedef struct
kernel_Activity kernel_Activity
;
typedef struct surf_Cpu surf_Cpu;
typedef struct routing_NetCard routing_NetCard;
typedef struct surf_Resource surf_Resource;
typedef struct surf_Cpu surf_Cpu;
typedef struct routing_NetCard routing_NetCard;
typedef struct surf_Resource surf_Resource;
@@
-57,9
+61,8
@@
typedef struct Trace tmgr_Trace;
typedef simgrid_As *AS_t;
typedef simgrid_Host* sg_host_t;
typedef simgrid_As *AS_t;
typedef simgrid_Host* sg_host_t;
-typedef simgrid_Mailbox* sg_mbox_t;
-typedef
simix_Synchro *smx_synchro
_t;
+typedef
kernel_Activity *smx_activity
_t;
typedef surf_Cpu *surf_cpu_t;
typedef routing_NetCard *sg_netcard_t;
typedef surf_Cpu *surf_cpu_t;
typedef routing_NetCard *sg_netcard_t;