#include <xbt/functional.hpp>
+#include <simgrid/simix/blocking_simcall.hpp>
+
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
#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>
*/
void* simcall_vm_create(const char *name, sg_host_t phys_host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host));
}
/**
*/
void simcall_vm_start(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
}
/**
*/
int simcall_vm_get_state(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_state, vm));
}
/**
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound));
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
/**
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_destroy, vm));
}
/**
*/
void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
{
- simgrid::simix::kernel(std::bind(
+ simgrid::simix::kernelImmediate(std::bind(
SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
*/
int simcall_process_count(void)
{
- return simgrid::simix::kernel(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);
+ return simgrid::simix::kernelImmediate(SIMIX_process_count);
}
/**
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
- simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data));
}
/**
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 .
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);
*/
void simcall_comm_cancel(smx_synchro_t synchro)
{
- simgrid::simix::kernel([synchro]{
- simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+ simgrid::simix::kernelImmediate([synchro]{
+ simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
comm->cancel();
});
}
/**
* \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);
}
/**
void simcall_run_kernel(std::function<void()> const& code)
{
- return simcall_BODY_run_kernel(&code);
+ simcall_BODY_run_kernel(&code);
+}
+
+void simcall_run_blocking(std::function<void()> const& code)
+{
+ simcall_BODY_run_blocking(&code);
}
int simcall_mc_random(int min, int max) {
const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
return simcall_names[kind];
}
+
+namespace simgrid {
+namespace simix {
+
+void unblock(smx_process_t process)
+{
+ xbt_assert(SIMIX_is_maestro());
+ SIMIX_simcall_answer(&process->simcall);
+}
+
+}
+}
