Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Thu, 5 May 2016 07:37:16 +0000 (09:37 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Thu, 5 May 2016 07:37:16 +0000 (09:37 +0200)
include/simgrid/simix.h
src/simix/libsmx.cpp
src/smpi/smpi_comm.cpp
src/smpi/smpi_dvfs.cpp

index aa4ba62..ce3e6c5 100644 (file)
@@ -272,13 +272,8 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro);
 XBT_PUBLIC(void) simcall_call(smx_process_t process);
 
 /******************************* Host simcalls ********************************/
-/* TODO use handlers and keep sg_host_t hidden from higher levels */
-XBT_PUBLIC(xbt_swag_t) simcall_host_get_process_list(sg_host_t host);
 XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data);
 
-XBT_PUBLIC(double) simcall_host_get_current_power_peak(sg_host_t host);
-XBT_PUBLIC(double) simcall_host_get_power_peak_at(sg_host_t host, int pstate_index);
-
 XBT_PUBLIC(smx_synchro_t) simcall_execution_start(const char *name,
                                                 double flops_amount,
                                                 double priority, double bound, unsigned long affinity_mask);
@@ -298,11 +293,6 @@ XBT_PUBLIC(void) simcall_execution_set_bound(smx_synchro_t execution, double bou
 XBT_PUBLIC(void) simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask);
 XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_synchro_t execution);
 
-XBT_PUBLIC(xbt_dict_t) simcall_host_get_mounted_storage_list(sg_host_t host);
-XBT_PUBLIC(xbt_dynar_t) simcall_host_get_attached_storage_list(sg_host_t host);
-XBT_PUBLIC(void) simcall_host_get_params(sg_host_t vm, vm_params_t param);
-XBT_PUBLIC(void) simcall_host_set_params(sg_host_t vm, vm_params_t param);
-
 /******************************* VM simcalls ********************************/
 // Create the vm_workstation at the SURF level
 XBT_PUBLIC(void*) simcall_vm_create(const char *name, sg_host_t host);
index 4d12952..7924a4f 100644 (file)
@@ -40,57 +40,7 @@ void simcall_call(smx_process_t process)
   }
 }
 
-// ***** 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)
-{
-  return host->processes();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_current_power_peak(sg_host_t host)
-{
-  return host->currentPowerPeak();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
-{
-  return host->powerPeakAt(pstate_index);
-}
-
-/** \deprecated */
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
-  vm->parameters(params);
-}
-
-/** \deprecated */
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
-  vm->setParameters(params);
-}
-
-/** \ingroup simix_storage_management
- *  \deprecated */
-xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
-{
-  return host->mountedStoragesAsDict();
-}
-
-/** \ingroup simix_storage_management
- *  \deprecated */
-xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
-{
-  return host->attachedStorages();
-}
-
-// ***** Other simcalls
+// ***** AS simcalls
 
 /**
  * \ingroup simix_host_management
index 3513ba6..eef72d0 100644 (file)
@@ -382,7 +382,7 @@ void smpi_comm_init_smp(MPI_Comm comm){
    }
   //identify neighbours in comm
   //get the indexes of all processes sharing the same simix host
-  xbt_swag_t process_list = simcall_host_get_process_list(SIMIX_host_self());
+  xbt_swag_t process_list = SIMIX_host_self()->processes();
   int intra_comm_size = 0;
   //only one process/node, disable SMP support and return
 //  if(intra_comm_size==1){
index c5d9142..1ab64e0 100644 (file)
@@ -20,7 +20,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi, "Logging specific to SMPI (expe
  */
 double smpi_get_host_power_peak_at(int pstate_index)
 {
-  return simcall_host_get_power_peak_at(SIMIX_host_self(), pstate_index);
+  return SIMIX_host_self()->powerPeakAt(pstate_index);
 }
 
 /**
@@ -30,7 +30,7 @@ double smpi_get_host_power_peak_at(int pstate_index)
  */
 double smpi_get_host_current_power_peak(void)
 {
-  return simcall_host_get_current_power_peak(SIMIX_host_self());
+  return SIMIX_host_self()->currentPowerPeak();
 }
 
 /**