kill 2 dumb functions in simix_vm

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 14d8226..46a9e5e 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -219,19 +219,27 @@ int simcall_vm_get_state(sg_host_t vm)
 
 /**
  * \ingroup simix_vm_management
 
 /**
  * \ingroup simix_vm_management

- * \brief Get the name of the physical host on which the given VM runs.
+ * \brief Get the physical host on which the given VM runs.

  *
  * \param vm VM
  *
  * \param vm VM

- * \return The name of the physical host
+ * \return The physical host

  */
 void *simcall_vm_get_pm(sg_host_t vm)
 {
  */
 void *simcall_vm_get_pm(sg_host_t vm)
 {

-  return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
+  return simgrid::simix::kernelImmediate(
+      [vm]() { return static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getPm(); });

 }
 
 }
 

+/**
+ * @brief Function to set the CPU bound of the given SIMIX VM host.
+ *
+ * @param host the vm host (a sg_host_t)
+ * @param bound bound (a double)
+ */

 void simcall_vm_set_bound(sg_host_t vm, double bound)
 {
 void simcall_vm_set_bound(sg_host_t vm, double bound)
 {

-  simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound));
+  simgrid::simix::kernelImmediate(
+      [vm, bound]() { static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setBound(bound); });

 }
 
 /**
 }
 
 /**

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 5c5b852..bb557e5 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -86,10 +86,6 @@ XBT_PRIVATE e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t ind_vm);
 // --
 XBT_PRIVATE void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm);
 
 // --
 XBT_PRIVATE void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm);
 

-XBT_PRIVATE void *SIMIX_vm_get_pm(sg_host_t ind_vm);
-
-XBT_PRIVATE void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound);
-

 XBT_PRIVATE void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm);
 
 SG_END_DECL()
 XBT_PRIVATE void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm);
 
 SG_END_DECL()

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index c104cc9..da21695 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -114,27 +114,6 @@ void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst
   SIMIX_vm_resume(vm, self);
 } 
 
   SIMIX_vm_resume(vm, self);
 } 
 

-/**
- * @brief Function to get the physical host of the given SIMIX VM host.
- *
- * @param host the vm host to get_phys_host (a sg_host_t)
- */
-void *SIMIX_vm_get_pm(sg_host_t host)
-{
-  return static_cast<simgrid::s4u::VirtualMachine*>(host)->pimpl_vm_->getPm();
-}
-
-/**
- * @brief Function to set the CPU bound of the given SIMIX VM host.
- *
- * @param host the vm host (a sg_host_t)
- * @param bound bound (a double)
- */
-void SIMIX_vm_set_bound(sg_host_t vm, double bound)
-{
-  static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setBound(bound);
-}
-

 /**
  * @brief Function to suspend a SIMIX VM host. This function stops the execution of the
  * VM. All the processes on this VM will pause. The state of the VM is
 /**
  * @brief Function to suspend a SIMIX VM host. This function stops the execution of the
  * VM. All the processes on this VM will pause. The state of the VM is