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
Make room for the upcoming network energy plugin
[simgrid.git]
/
include
/
simgrid
/
simix.h
diff --git
a/include/simgrid/simix.h
b/include/simgrid/simix.h
index
4d861d5
..
4105374
100644
(file)
--- a/
include/simgrid/simix.h
+++ b/
include/simgrid/simix.h
@@
-19,9
+19,13
@@
namespace kernel {
namespace context {
class Context;
class ContextFactory;
namespace context {
class Context;
class ContextFactory;
-}}
+ }
+ namespace activity {
+ class MailboxImpl;
+ }
+ }
-namespace simix {
+
namespace simix {
/** @brief Process datatype
@ingroup simix_process_management
/** @brief Process datatype
@ingroup simix_process_management
@@
-32,14
+36,13
@@
namespace simix {
@{ */
class ActorImpl;
class Mutex;
@{ */
class ActorImpl;
class Mutex;
- class Mailbox;
}
}
typedef simgrid::kernel::context::Context *smx_context_t;
typedef simgrid::simix::ActorImpl *smx_actor_t;
typedef simgrid::simix::Mutex *smx_mutex_t;
}
}
typedef simgrid::kernel::context::Context *smx_context_t;
typedef simgrid::simix::ActorImpl *smx_actor_t;
typedef simgrid::simix::Mutex *smx_mutex_t;
-typedef simgrid::
simix::Mailbox *
smx_mailbox_t;
+typedef simgrid::
kernel::activity::MailboxImpl*
smx_mailbox_t;
#else
#else
@@
-291,12
+294,6
@@
XBT_PUBLIC(void) simcall_process_join(smx_actor_t process, double timeout);
XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration);
/************************** Comunication simcalls *****************************/
XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration);
/************************** Comunication simcalls *****************************/
-/***** Rendez-vous points *****/
-
-XBT_PUBLIC(smx_mailbox_t) simcall_mbox_create(const char *name);
-XBT_PUBLIC(void) simcall_mbox_set_receiver(smx_mailbox_t mbox , smx_actor_t process);
-
-/***** Communication simcalls *****/
XBT_PUBLIC(void) simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size,
double rate, void *src_buff,
XBT_PUBLIC(void) simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size,
double rate, void *src_buff,