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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
b486383
..
8d4d26c
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-49,7
+49,9
@@
typedef boost::intrusive_ptr<Exec> ExecPtr;
XBT_PUBLIC void intrusive_ptr_release(Exec* e);
XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
class ExecSeq;
XBT_PUBLIC void intrusive_ptr_release(Exec* e);
XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
class ExecSeq;
+typedef boost::intrusive_ptr<ExecSeq> ExecSeqPtr;
class ExecPar;
class ExecPar;
+typedef boost::intrusive_ptr<ExecPar> ExecParPtr;
class Host;
class Host;
@@
-62,10
+64,6
@@
XBT_PUBLIC void intrusive_ptr_add_ref(Io* i);
class Link;
class Mailbox;
class Link;
class Mailbox;
-/** Smart pointer to a simgrid::s4u::Mailbox */
-typedef boost::intrusive_ptr<Mailbox> MailboxPtr;
-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);
class Mutex;
XBT_PUBLIC void intrusive_ptr_release(Mutex* m);
@@
-135,11
+133,16
@@
class System;
}
namespace resource {
class Action;
}
namespace resource {
class Action;
+class Cpu;
class Model;
class Resource;
class Model;
class Resource;
+class CpuModel;
class NetworkModel;
class LinkImpl;
class NetworkAction;
class NetworkModel;
class LinkImpl;
class NetworkAction;
+class StorageImpl;
+class StorageType;
+class StorageModel;
}
namespace routing {
class ClusterCreationArgs;
}
namespace routing {
class ClusterCreationArgs;
@@
-159,13
+162,8
@@
namespace simix {
class Timer;
}
namespace surf {
class Timer;
}
namespace surf {
- class Cpu;
- class CpuModel;
class HostImpl;
class HostModel;
class HostImpl;
class HostModel;
- class StorageImpl;
- class StorageType;
- class StorageModel;
}
namespace mc {
class CommunicationDeterminismChecker;
}
namespace mc {
class CommunicationDeterminismChecker;
@@
-181,6
+179,8
@@
typedef simgrid::s4u::Barrier s4u_Barrier;
typedef simgrid::s4u::Host s4u_Host;
typedef simgrid::s4u::Link s4u_Link;
typedef simgrid::s4u::File s4u_File;
typedef simgrid::s4u::Host s4u_Host;
typedef simgrid::s4u::Link s4u_Link;
typedef simgrid::s4u::File s4u_File;
+typedef simgrid::s4u::ConditionVariable s4u_ConditionVariable;
+typedef simgrid::s4u::Mutex s4u_Mutex;
typedef simgrid::s4u::Semaphore s4u_Semaphore;
typedef simgrid::s4u::Storage s4u_Storage;
typedef simgrid::s4u::NetZone s4u_NetZone;
typedef simgrid::s4u::Semaphore s4u_Semaphore;
typedef simgrid::s4u::Storage s4u_Storage;
typedef simgrid::s4u::NetZone s4u_NetZone;
@@
-188,7
+188,6
@@
typedef simgrid::s4u::VirtualMachine s4u_VM;
typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
typedef simgrid::simix::Timer* smx_timer_t;
typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
typedef simgrid::simix::Timer* smx_timer_t;
-typedef simgrid::kernel::context::Context* smx_context_t;
typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
typedef simgrid::kernel::activity::ConditionVariableImpl* smx_cond_t;
typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
typedef simgrid::kernel::activity::ConditionVariableImpl* smx_cond_t;
typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
@@
-202,6
+201,8
@@
typedef struct s4u_Barrier s4u_Barrier;
typedef struct s4u_Host s4u_Host;
typedef struct s4u_Link s4u_Link;
typedef struct s4u_File s4u_File;
typedef struct s4u_Host s4u_Host;
typedef struct s4u_Link s4u_Link;
typedef struct s4u_File s4u_File;
+typedef struct s4u_ConditionVariable s4u_ConditionVariable;
+typedef struct s4u_Mutex s4u_Mutex;
typedef struct s4u_Semaphore s4u_Semaphore;
typedef struct s4u_Storage s4u_Storage;
typedef struct s4u_NetZone s4u_NetZone;
typedef struct s4u_Semaphore s4u_Semaphore;
typedef struct s4u_Storage s4u_Storage;
typedef struct s4u_NetZone s4u_NetZone;
@@
-211,7
+212,6
@@
typedef struct kernel_Activity* smx_activity_t;
typedef struct s_smx_timer* smx_timer_t;
typedef struct s_smx_actor* smx_actor_t;
typedef struct s_smx_cond_t* smx_cond_t;
typedef struct s_smx_timer* smx_timer_t;
typedef struct s_smx_actor* smx_actor_t;
typedef struct s_smx_cond_t* smx_cond_t;
-typedef struct s_smx_context* smx_context_t;
typedef struct s_smx_mailbox* smx_mailbox_t;
typedef struct s_smx_mutex* smx_mutex_t;
typedef struct s_smx_sem* smx_sem_t;
typedef struct s_smx_mailbox* smx_mailbox_t;
typedef struct s_smx_mutex* smx_mutex_t;
typedef struct s_smx_sem* smx_sem_t;
@@
-219,6
+219,8
@@
typedef struct s_smx_sem* smx_sem_t;
#endif
typedef s4u_Barrier* sg_bar_t;
#endif
typedef s4u_Barrier* sg_bar_t;
+typedef s4u_ConditionVariable* sg_cond_t;
+typedef s4u_Mutex* sg_mutex_t;
typedef s4u_Semaphore* sg_sem_t;
typedef s4u_NetZone* sg_netzone_t;
typedef s4u_Host* sg_host_t;
typedef s4u_Semaphore* sg_sem_t;
typedef s4u_NetZone* sg_netzone_t;
typedef s4u_Host* sg_host_t;