Give simgrid's host its own header file and datatype

[simgrid.git] / src / simix / libsmx.c

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index 0e63140..c26e995 100644 (file)
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -28,7 +28,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
  * \param name The name of the host to get
  * \return The corresponding host
  */
-smx_host_t simcall_host_get_by_name(const char *name)
+sg_host_t simcall_host_get_by_name(const char *name)
 {
   return simcall_BODY_host_get_by_name(name);
 }
@@ -40,7 +40,7 @@ smx_host_t simcall_host_get_by_name(const char *name)
  * \param host A SIMIX host
  * \return The name of this host
  */
-const char* simcall_host_get_name(smx_host_t host)
+const char* simcall_host_get_name(sg_host_t host)
 {
   return simcall_BODY_host_get_name(host);
 }
@@ -51,7 +51,7 @@ const char* simcall_host_get_name(smx_host_t host)
  *
  * \param host A SIMIX host
  */
-void simcall_host_on(smx_host_t host)
+void simcall_host_on(sg_host_t host)
 {
   simcall_BODY_host_on(host);
 }
@@ -62,7 +62,7 @@ void simcall_host_on(smx_host_t host)
  *
  * \param host A SIMIX host
  */
-void simcall_host_off(smx_host_t host)
+void simcall_host_off(sg_host_t host)
 {
   simcall_BODY_host_off(host);
 }
@@ -74,7 +74,7 @@ void simcall_host_off(smx_host_t host)
  * \param host A host
  * \return The properties of this host
  */
-xbt_dict_t simcall_host_get_properties(smx_host_t host)
+xbt_dict_t simcall_host_get_properties(sg_host_t host)
 {
   return simcall_BODY_host_get_properties(host);
 }
@@ -100,7 +100,7 @@ xbt_dict_t simcall_asr_get_properties(const char *name)
  * \param host A SIMIX host
  * \return The speed of this host (in Mflop/s)
  */
-double simcall_host_get_speed(smx_host_t host)
+double simcall_host_get_speed(sg_host_t host)
 {
   return simcall_BODY_host_get_speed(host);
 }
@@ -112,7 +112,7 @@ double simcall_host_get_speed(smx_host_t host)
  * \param host A SIMIX host
  * \return The number of core
  */
-int simcall_host_get_core(smx_host_t host)
+int simcall_host_get_core(sg_host_t host)
 {
   return simcall_BODY_host_get_core(host);
 }
@@ -124,7 +124,7 @@ int simcall_host_get_core(smx_host_t host)
  * \param host A SIMIX host
  * \return the swag of attached processes
  */
-xbt_swag_t simcall_host_get_process_list(smx_host_t host)
+xbt_swag_t simcall_host_get_process_list(sg_host_t host)
 {
   return simcall_BODY_host_get_process_list(host);
 }
@@ -136,7 +136,7 @@ xbt_swag_t simcall_host_get_process_list(smx_host_t host)
  *
  * \return Speed currently available (in Mflop/s)
  */
-double simcall_host_get_available_speed(smx_host_t host)
+double simcall_host_get_available_speed(sg_host_t host)
 {
   return simcall_BODY_host_get_available_speed(host);
 }
@@ -149,7 +149,7 @@ double simcall_host_get_available_speed(smx_host_t host)
  * \param host A SIMIX host
  * \return 1 if the host is available, 0 otherwise
  */
-int simcall_host_get_state(smx_host_t host)
+int simcall_host_get_state(sg_host_t host)
 {
   return simcall_BODY_host_get_state(host);
 }
@@ -161,7 +161,7 @@ int simcall_host_get_state(smx_host_t host)
  * \param host A SIMIX host
  * \return the current power peak value (double)
  */
-double simcall_host_get_current_power_peak(smx_host_t host)
+double simcall_host_get_current_power_peak(sg_host_t host)
 {
   return simcall_BODY_host_get_current_power_peak(host);
 }
@@ -174,7 +174,7 @@ double simcall_host_get_current_power_peak(smx_host_t host)
  * \param pstate_index pstate to test
  * \return the current power peak value (double) for pstate_index
  */
-double simcall_host_get_power_peak_at(smx_host_t host, int pstate_index)
+double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
 {
   return simcall_BODY_host_get_power_peak_at(host, pstate_index);
 }
@@ -186,7 +186,7 @@ double simcall_host_get_power_peak_at(smx_host_t host, int pstate_index)
  * \param host A SIMIX host
  * \return the number of power states
  */
-int simcall_host_get_nb_pstates(smx_host_t host)
+int simcall_host_get_nb_pstates(sg_host_t host)
 {
   return simcall_BODY_host_get_nb_pstates(host);
 }
@@ -198,7 +198,7 @@ int simcall_host_get_nb_pstates(smx_host_t host)
  * \param host A SIMIX host
  * \param pstate_index The pstate to which the CPU power will be set
  */
-void simcall_host_set_pstate(smx_host_t host, int pstate_index)
+void simcall_host_set_pstate(sg_host_t host, int pstate_index)
 {
        simcall_BODY_host_set_pstate(host, pstate_index);
 }
@@ -208,7 +208,7 @@ void simcall_host_set_pstate(smx_host_t host, int pstate_index)
  *
  * \param host A SIMIX host
  */
-int simcall_host_get_pstate(smx_host_t host)
+int simcall_host_get_pstate(sg_host_t host)
 {
        return simcall_BODY_host_get_pstate(host);
 }
@@ -220,7 +220,7 @@ int simcall_host_get_pstate(smx_host_t host)
  * \param host A SIMIX host
  * \return the energy consumed by the host (double)
  */
-double simcall_host_get_consumed_energy(smx_host_t host)
+double simcall_host_get_consumed_energy(sg_host_t host)
 {
   return simcall_BODY_host_get_consumed_energy(host);
 }
@@ -254,7 +254,7 @@ double simcall_host_get_wattmax_at(msg_host_t host, int pstate){
  * \param affinity_mask
  * \return A new SIMIX execution synchronization
  */
-smx_synchro_t simcall_host_execute(const char *name, smx_host_t host,
+smx_synchro_t simcall_host_execute(const char *name, sg_host_t host,
                                     double flops_amount,
                                     double priority, double bound, unsigned long affinity_mask)
 {
@@ -282,7 +282,7 @@ smx_synchro_t simcall_host_execute(const char *name, smx_host_t host,
  */
 smx_synchro_t simcall_host_parallel_execute(const char *name,
                                          int host_nb,
-                                         smx_host_t *host_list,
+                                         sg_host_t *host_list,
                                          double *flops_amount,
                                          double *bytes_amount,
                                          double amount,
@@ -394,7 +394,7 @@ void simcall_host_execution_set_bound(smx_synchro_t execution, double bound)
  * \param host Host
  * \param mask Affinity mask
  */
-void simcall_host_execution_set_affinity(smx_synchro_t execution, smx_host_t host, unsigned long mask)
+void simcall_host_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
 {
   simcall_BODY_host_execution_set_affinity(execution, host, mask);
 }
@@ -420,7 +420,7 @@ e_smx_state_t simcall_host_execution_wait(smx_synchro_t execution)
  *
  * \return The host object of the VM
  */
-void* simcall_vm_create(const char *name, smx_host_t phys_host){
+void* simcall_vm_create(const char *name, sg_host_t phys_host){
   return simcall_BODY_vm_create(name, phys_host);
 }
 
@@ -430,7 +430,7 @@ void* simcall_vm_create(const char *name, smx_host_t phys_host){
  *
  * \param vm VM
  */
-void simcall_vm_start(smx_host_t vm)
+void simcall_vm_start(sg_host_t vm)
 {
   simcall_BODY_vm_start(vm);
 }
@@ -442,7 +442,7 @@ void simcall_vm_start(smx_host_t vm)
  * \param vm VM
  * \return The state of the VM
  */
-int simcall_vm_get_state(smx_host_t vm)
+int simcall_vm_get_state(sg_host_t vm)
 {
   return simcall_BODY_vm_get_state(vm);
 }
@@ -454,27 +454,27 @@ int simcall_vm_get_state(smx_host_t vm)
  * \param vm VM
  * \return The name of the physical host
  */
-void *simcall_vm_get_pm(smx_host_t vm)
+void *simcall_vm_get_pm(sg_host_t vm)
 {
   return simcall_BODY_vm_get_pm(vm);
 }
 
-void simcall_vm_set_bound(smx_host_t vm, double bound)
+void simcall_vm_set_bound(sg_host_t vm, double bound)
 {
   simcall_BODY_vm_set_bound(vm, bound);
 }
 
-void simcall_vm_set_affinity(smx_host_t vm, smx_host_t pm, unsigned long mask)
+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(smx_host_t vm, ws_params_t params)
+void simcall_host_get_params(sg_host_t vm, ws_params_t params)
 {
   simcall_BODY_host_get_params(vm, params);
 }
 
-void simcall_host_set_params(smx_host_t vm, ws_params_t params)
+void simcall_host_set_params(sg_host_t vm, ws_params_t params)
 {
   simcall_BODY_host_set_params(vm, params);
 }
@@ -486,7 +486,7 @@ void simcall_host_set_params(smx_host_t vm, ws_params_t params)
  * \param vm VM
  * \param host Destination physical host
  */
-void simcall_vm_migrate(smx_host_t vm, smx_host_t host)
+void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
 {
   simcall_BODY_vm_migrate(vm, host);
 }
@@ -497,7 +497,7 @@ void simcall_vm_migrate(smx_host_t vm, smx_host_t host)
  *
  * \param vm VM
  */
-void simcall_vm_suspend(smx_host_t vm)
+void simcall_vm_suspend(sg_host_t vm)
 {
   simcall_BODY_vm_suspend(vm);
 }
@@ -508,7 +508,7 @@ void simcall_vm_suspend(smx_host_t vm)
  *
  * \param vm VM
  */
-void simcall_vm_resume(smx_host_t vm)
+void simcall_vm_resume(sg_host_t vm)
 {
   simcall_BODY_vm_resume(vm);
 }
@@ -519,7 +519,7 @@ void simcall_vm_resume(smx_host_t vm)
  *
  * \param vm VM
  */
-void simcall_vm_save(smx_host_t vm)
+void simcall_vm_save(sg_host_t vm)
 {
   simcall_BODY_vm_save(vm);
 }
@@ -530,7 +530,7 @@ void simcall_vm_save(smx_host_t vm)
  *
  * \param vm VM
  */
-void simcall_vm_restore(smx_host_t vm)
+void simcall_vm_restore(sg_host_t vm)
 {
   simcall_BODY_vm_restore(vm);
 }
@@ -541,7 +541,7 @@ void simcall_vm_restore(smx_host_t vm)
  *
  * \param vm VM
  */
-void simcall_vm_shutdown(smx_host_t vm)
+void simcall_vm_shutdown(sg_host_t vm)
 {
   simcall_BODY_vm_shutdown(vm);
 }
@@ -552,7 +552,7 @@ void simcall_vm_shutdown(smx_host_t vm)
  *
  * \param vm VM
  */
-void simcall_vm_destroy(smx_host_t vm)
+void simcall_vm_destroy(sg_host_t vm)
 {
   simcall_BODY_vm_destroy(vm);
 }
@@ -571,7 +571,7 @@ void simcall_vm_destroy(smx_host_t vm)
  * \param src_pm  Source physical host
  * \param dst_pmt Destination physical host
  */
-void simcall_vm_migratefrom_resumeto(smx_host_t vm, smx_host_t src_pm, smx_host_t dst_pm)
+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);
 }
@@ -649,7 +649,7 @@ void simcall_process_cleanup(smx_process_t process)
  * \param process the process to migrate
  * \param dest name of the new host
  */
-void simcall_process_change_host(smx_process_t process, smx_host_t dest)
+void simcall_process_change_host(smx_process_t process, sg_host_t dest)
 {
   simcall_BODY_process_change_host(process, dest);
 }
@@ -779,7 +779,7 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
   if (kill_time > SIMIX_get_clock()) {
     if (simix_global->kill_process_function) {
       XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
-          sg_host_name(process->smx_host));
+          sg_host_name(process->host));
       process->kill_timer = SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
     }
   }
@@ -789,12 +789,12 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
  * \ingroup simix_process_management
  * \brief Return the location on which an agent is running.
  *
- * This functions returns the smx_host_t corresponding to the location on which
+ * This functions returns the sg_host_t corresponding to the location on which
  * \a process is running.
  * \param process SIMIX process
  * \return SIMIX host
  */
-smx_host_t simcall_process_get_host(smx_process_t process)
+sg_host_t simcall_process_get_host(smx_process_t process)
 {
   return simcall_BODY_process_get_host(process);
 }
@@ -929,7 +929,7 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name)
  *  \param host The host to be counted
  *  \return The number of comm synchros pending in the rdv
  */
-int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host)
+int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host)
 {
   return simcall_BODY_rdv_comm_count_by_host(rdv, host);
 }
@@ -1350,7 +1350,7 @@ int simcall_sem_get_capacity(smx_sem_t sem)
  * \ingroup simix_file_management
  *
  */
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
+sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
 {
   return simcall_BODY_file_read(fd, size, host);
 }
@@ -1359,7 +1359,7 @@ sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
  * \ingroup simix_file_management
  *
  */
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
+sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
 {
   return simcall_BODY_file_write(fd, size, host);
 }
@@ -1368,7 +1368,7 @@ sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
  * \ingroup simix_file_management
  * \brief
  */
-smx_file_t simcall_file_open(const char* fullpath, smx_host_t host)
+smx_file_t simcall_file_open(const char* fullpath, sg_host_t host)
 {
   return simcall_BODY_file_open(fullpath, host);
 }
@@ -1377,7 +1377,7 @@ smx_file_t simcall_file_open(const char* fullpath, smx_host_t host)
  * \ingroup simix_file_management
  *
  */
-int simcall_file_close(smx_file_t fd, smx_host_t host)
+int simcall_file_close(smx_file_t fd, sg_host_t host)
 {
   return simcall_BODY_file_close(fd, host);
 }
@@ -1386,7 +1386,7 @@ int simcall_file_close(smx_file_t fd, smx_host_t host)
  * \ingroup simix_file_management
  *
  */
-int simcall_file_unlink(smx_file_t fd, smx_host_t host)
+int simcall_file_unlink(smx_file_t fd, sg_host_t host)
 {
   return simcall_BODY_file_unlink(fd, host);
 }
@@ -1460,7 +1460,7 @@ sg_size_t simcall_storage_get_used_size (smx_storage_t storage){
  * \param host A SIMIX host
  * \return a dict containing all storages mounted on the host
  */
-xbt_dict_t simcall_host_get_mounted_storage_list(smx_host_t host)
+xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
 {
   return simcall_BODY_host_get_mounted_storage_list(host);
 }
@@ -1471,7 +1471,7 @@ xbt_dict_t simcall_host_get_mounted_storage_list(smx_host_t 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(smx_host_t host)
+xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
 {
   return simcall_BODY_host_get_attached_storage_list(host);
 }