/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <functional>
+
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.h"
#include "xbt/ex.h"
#include <math.h> /* isfinite() */
#include "mc/mc.h"
+#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_private.hpp"
+
+#include <simgrid/simix.hpp>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
#include "popping_bodies.cpp"
-/**
- * \ingroup simix_host_management
- * \brief Start the host if it is off
- *
- * \param host A SIMIX host
- */
-void simcall_host_on(sg_host_t host)
+void simcall_call(smx_process_t process)
{
- simcall_BODY_host_on(host);
+ if (process != simix_global->maestro_process) {
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name,
+ SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call);
+ SIMIX_process_yield(process);
+ } else {
+ SIMIX_simcall_handle(&process->simcall, 0);
+ }
}
-/**
- * \ingroup simix_host_management
- * \brief Stop the host if it is on
- *
- * \param host A SIMIX host
- */
-void simcall_host_off(sg_host_t host)
+// ***** Host simcalls
+// Those functions are replaced by methods on the Host object.
+
+/** \ingroup simix_host_management
+ * \deprecated */
+xbt_swag_t simcall_host_get_process_list(sg_host_t host)
{
- simcall_BODY_host_off(host);
+ return host->getProcessList();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a host.
- *
- * \param host A host
- * \return The properties of this host
- */
-xbt_dict_t simcall_host_get_properties(sg_host_t host)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_current_power_peak(sg_host_t host)
{
- return simcall_BODY_host_get_properties(host);
+ return host->getCurrentPowerPeak();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a router or AS.
- *
- * \param name The name of the router or AS
- * \return The properties
- */
-xbt_dict_t simcall_asr_get_properties(const char *name)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
{
- return simcall_BODY_asr_get_properties(name);
+ return host->getPowerPeakAt(pstate_index);
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the list of processes attached to the host.
- *
- * \param host A SIMIX host
- * \return the swag of attached processes
- */
-xbt_swag_t simcall_host_get_process_list(sg_host_t host)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_wattmin_at(msg_host_t host, int pstate)
{
- return simcall_BODY_host_get_process_list(host);
+ return host->getWattMinAt(pstate);
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the power peak of a host.
- *
- * \param host A SIMIX host
- * \return the current power peak value (double)
- */
-double simcall_host_get_current_power_peak(sg_host_t host)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_wattmax_at(msg_host_t host, int pstate)
{
- return simcall_BODY_host_get_current_power_peak(host);
+ return host->getWattMaxAt(pstate);
}
-/**
- * \ingroup simix_host_management
- * \brief Returns one power peak (in flops/s) of a host at a given pstate
- *
- * \param host A SIMIX host
- * \param pstate_index pstate to test
- * \return the current power peak value (double) for pstate_index
- */
-double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
+/** \deprecated */
+void simcall_host_get_params(sg_host_t vm, vm_params_t params)
{
- return simcall_BODY_host_get_power_peak_at(host, pstate_index);
+ vm->getParams(params);
}
-/**
- * \ingroup simix_host_management
- * \brief Sets the pstate at which the host should run
- *
- * \param host A SIMIX host
- * \param pstate_index The pstate to which the CPU power will be set
- */
-void simcall_host_set_pstate(sg_host_t host, int pstate_index)
+/** \deprecated */
+void simcall_host_set_params(sg_host_t vm, vm_params_t params)
{
- simcall_BODY_host_set_pstate(host, pstate_index);
+ vm->setParams(params);
}
-/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
- */
-double simcall_host_get_wattmin_at(msg_host_t host, int pstate){
- return simcall_BODY_host_get_wattmin_at(host, pstate);
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
+{
+ return host->getMountedStorageList();
}
-/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
- */
-double simcall_host_get_wattmax_at(msg_host_t host, int pstate){
- return simcall_BODY_host_get_wattmax_at(host, pstate);
+
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
+{
+ return host->getAttachedStorageList();
}
+// ***** Other simcalls
+/**
+ * \ingroup simix_host_management
+ * \brief Returns a dict of the properties assigned to a router or AS.
+ *
+ * \param name The name of the router or AS
+ * \return The properties
+ */
+xbt_dict_t simcall_asr_get_properties(const char *name)
+{
+ return simcall_BODY_asr_get_properties(name);
+}
/**
* \ingroup simix_process_management
*
* \return The host object of the VM
*/
-void* simcall_vm_create(const char *name, sg_host_t phys_host){
- return simcall_BODY_vm_create(name, phys_host);
+void* simcall_vm_create(const char *name, sg_host_t phys_host)
+{
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
}
/**
*/
void simcall_vm_start(sg_host_t vm)
{
- simcall_BODY_vm_start(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm));
}
/**
*/
int simcall_vm_get_state(sg_host_t vm)
{
- return simcall_BODY_vm_get_state(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
}
/**
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simcall_BODY_vm_get_pm(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simcall_BODY_vm_set_bound(vm, bound);
+ simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
- simcall_BODY_vm_set_affinity(vm, pm, mask);
-}
-
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
- simcall_BODY_host_get_params(vm, params);
-}
-
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
- simcall_BODY_host_set_params(vm, params);
+ simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
/**
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
- simcall_BODY_vm_migrate(vm, host);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simcall_BODY_vm_destroy(vm);
+ simgrid::simix::kernel(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)
{
- simcall_BODY_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
+ simgrid::simix::kernel(std::bind(
+ SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
/**
*/
int simcall_process_count(void)
{
- return simcall_BODY_process_count();
+ return simgrid::simix::kernel(SIMIX_process_count);
}
/**
*/
int simcall_process_get_PID(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_PID(process);
- }
-
- return simcall_BODY_process_get_PID(process);
+ return SIMIX_process_get_PID(process);
}
/**
*/
int simcall_process_get_PPID(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_PPID(process);
- }
-
- return simcall_BODY_process_get_PPID(process);
+ return SIMIX_process_get_PPID(process);
}
/**
*/
void* simcall_process_get_data(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_data(process);
- }
-
- return simcall_BODY_process_get_data(process);
+ return SIMIX_process_get_data(process);
}
/**
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- SIMIX_process_self_set_data(process, data);
- }
- else {
- simcall_BODY_process_set_data(process, data);
- }
+ simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
}
static void kill_process(void* arg)
*/
sg_host_t simcall_process_get_host(smx_process_t process)
{
- return simcall_BODY_process_get_host(process);
+ return SIMIX_process_get_host(process);
}
/**
*/
const char* simcall_process_get_name(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return process->name;
- }
- return simcall_BODY_process_get_name(process);
+ return SIMIX_process_get_name(process);
}
/**
*/
int simcall_process_is_suspended(smx_process_t process)
{
- return simcall_BODY_process_is_suspended(process);
+ return simcall_BODY_process_is_suspended(process);
}
/**
*/
xbt_dict_t simcall_process_get_properties(smx_process_t process)
{
- return simcall_BODY_process_get_properties(process);
+ return SIMIX_process_get_properties(process);
}
/**
* \ingroup simix_process_management
return simcall_BODY_storage_get_used_size(storage);
}
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \param host A SIMIX host
- * \return a dict containing all storages mounted on the host
- */
-xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
-{
- return simcall_BODY_host_get_mounted_storage_list(host);
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \param host A SIMIX host
- * \return a dict containing all storages attached to the host
- */
-xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
-{
- return simcall_BODY_host_get_attached_storage_list(host);
-}
-
/**
* \ingroup simix_storage_management
* \brief Returns a dict of the properties assigned to a storage element.
return simcall_BODY_storage_get_content(storage);
}
-
+void simcall_run_kernel(std::function<void()> const& code)
+{
+ return simcall_BODY_run_kernel((void*) &code);
+}
#ifdef HAVE_MC
