X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dac5d8074d0d4971410ad158c52f1bc6f1dda9a4..55092bf3f9fe1cccfe72f7ef81fcd51f9a0eb4ca:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 95edc8c321..458a8ea8a1 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -19,6 +19,12 @@ #ifdef __cplusplus namespace simgrid { +namespace kernel { +namespace context { + class Context; + class ContextFactory; +}} + namespace simix { /** @brief Process datatype @@ -28,16 +34,14 @@ namespace simix { data, executing in a location. \see m_process_management @{ */ - class Process; - class Context; - class ContextFactory; + class ActorImpl; class Mutex; class Mailbox; } } -typedef simgrid::simix::Context *smx_context_t; -typedef simgrid::simix::Process *smx_process_t; +typedef simgrid::kernel::context::Context *smx_context_t; +typedef simgrid::simix::ActorImpl *smx_process_t; typedef simgrid::simix::Mutex *smx_mutex_t; typedef simgrid::simix::Mailbox *smx_mailbox_t; @@ -301,10 +305,6 @@ XBT_PUBLIC(int) simcall_process_count(void); XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process); XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data); XBT_PUBLIC(void) simcall_process_set_host(smx_process_t process, sg_host_t dest); -XBT_PUBLIC(sg_host_t) simcall_process_get_host(smx_process_t process); -XBT_PUBLIC(const char *) simcall_process_get_name(smx_process_t process); -XBT_PUBLIC(int) simcall_process_get_PID(smx_process_t process); -XBT_PUBLIC(int) simcall_process_get_PPID(smx_process_t process); XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process); XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host); XBT_PUBLIC(void) simcall_process_set_kill_time(smx_process_t process, double kill_time); @@ -320,7 +320,6 @@ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration); /***** Rendez-vous points *****/ XBT_PUBLIC(smx_mailbox_t) simcall_mbox_create(const char *name); -XBT_PUBLIC(smx_synchro_t) simcall_mbox_front(smx_mailbox_t mbox); XBT_PUBLIC(void) simcall_mbox_set_receiver(smx_mailbox_t mbox , smx_process_t process); /***** Communication simcalls *****/