X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e9b70d3dc4bc81e7f13c923ba3e6a736395d963..f9df6a0ce7023e4e22d83bb6c50f27bd21fab329:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 8f41f627b8..eaf002e6b8 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 <simgrid/simix.hpp>
 
@@ -439,33 +439,11 @@ void simcall_process_resume(smx_process_t process)
  *
  * Maestro internal process is not counted, only user code processes are
  */
-int simcall_process_count(void)
+int simcall_process_count()
 {
   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<simgrid::simix::Comm*>(synchro);
+    simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
     comm->cancel();
   });
 }
@@ -765,19 +692,19 @@ void simcall_comm_cancel(smx_synchro_t synchro)
 /**
  * \ingroup simix_comm_management
  */
-unsigned int simcall_comm_waitany(xbt_dynar_t comms)
+unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout)
 {
-  return simcall_BODY_comm_waitany(comms);
+  return simcall_BODY_comm_waitany(comms, timeout);
 }
 
 /**
  * \ingroup simix_comm_management
  */
-int simcall_comm_testany(xbt_dynar_t comms)
+int simcall_comm_testany(smx_synchro_t* comms, size_t count)
 {
-  if (xbt_dynar_is_empty(comms))
+  if (count == 0)
     return -1;
-  return simcall_BODY_comm_testany(comms);
+  return simcall_BODY_comm_testany(comms, count);
 }
 
 /**
@@ -817,7 +744,7 @@ int simcall_comm_test(smx_synchro_t comm)
  * \ingroup simix_synchro_management
  *
  */
-smx_mutex_t simcall_mutex_init(void)
+smx_mutex_t simcall_mutex_init()
 {
   if(!simix_global) {
     fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
@@ -857,7 +784,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex)
  * \ingroup simix_synchro_management
  *
  */
-smx_cond_t simcall_cond_init(void)
+smx_cond_t simcall_cond_init()
 {
   return simcall_BODY_cond_init();
 }
@@ -1119,4 +1046,4 @@ void unblock(smx_process_t process)
 }
 
 }
-}
\ No newline at end of file
+}