X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b51da37243dc16575499f4cb7729fe8bdd7fa514..d4bde2116e4f10c14aa2729b83d4119e24043d4d:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 8cf08c4a39..4d68d3d7d0 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -25,7 +25,7 @@ #include "xbt/ex.h" #include "mc/mc.h" #include "src/simix/smx_host_private.h" -#include "src/simix/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" #include @@ -444,28 +444,6 @@ int simcall_process_count(void) return simgrid::simix::kernelImmediate(SIMIX_process_count); } -/** - * \ingroup simix_process_management - * \brief Return the PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process - */ -int simcall_process_get_PID(smx_process_t process) -{ - return SIMIX_process_get_PID(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the parent PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process parenrt - */ -int simcall_process_get_PPID(smx_process_t process) -{ - return SIMIX_process_get_PPID(process); -} - /** * \ingroup simix_process_management * \brief Return the user data of a #smx_process_t. @@ -514,33 +492,6 @@ double simcall_process_get_kill_time(smx_process_t process) { return SIMIX_timer_get_date(process->kill_timer); } -/** - * \ingroup simix_process_management - * \brief Return the location on which an agent is running. - * - * This functions returns the sg_host_t corresponding to the location on which - * \a process is running. - * \param process SIMIX process - * \return SIMIX host - */ -sg_host_t simcall_process_get_host(smx_process_t process) -{ - return SIMIX_process_get_host(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the name of an agent. - * - * This functions checks whether \a process is a valid pointer or not and return its name. - * \param process SIMIX process - * \return The process name - */ -const char* simcall_process_get_name(smx_process_t process) -{ - return SIMIX_process_get_name(process); -} - /** * \ingroup simix_process_management * \brief Returns true if the process is suspended . @@ -621,30 +572,6 @@ smx_mailbox_t simcall_mbox_create(const char *name) return simcall_BODY_mbox_create(name); } -/** - * \ingroup simix_mbox_management - * \brief Returns a rendez-vous point knowing its name - */ -smx_mailbox_t simcall_mbox_get_by_name(const char *name) -{ - /* FIXME: this is a horrible loss of performance, so we hack it out by - * skipping the simcall (for now). It works in parallel, it won't work on - * distributed but probably we will change MSG for that. */ - - return SIMIX_mbox_get_by_name(name); -} - -/** - * \ingroup simix_mbox_management - * \brief returns the communication at the head of the rendez-vous - * \param mbox The rendez-vous point - * \return The communication or nullptr if empty - */ -smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox) -{ - return mbox->comm_queue.empty() ? nullptr : mbox->comm_queue.front(); -} - void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process) { simcall_BODY_mbox_set_receiver(mbox, process); @@ -757,7 +684,7 @@ smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag void simcall_comm_cancel(smx_synchro_t synchro) { simgrid::simix::kernelImmediate([synchro]{ - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); comm->cancel(); }); } @@ -1119,4 +1046,4 @@ void unblock(smx_process_t process) } } -} \ No newline at end of file +}