X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d92bb5e90dbe8bd7eead32aba6941a4341fcf204..ba5400c9278f4f61cf8319210a5edda78e0c5bd8:/src/simix/smx_host_private.h

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 17d0ec1994..471f3edf41 100644
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -41,8 +41,6 @@ xbt_swag_t SIMIX_host_get_process_list(sg_host_t host);
 double SIMIX_host_get_speed(sg_host_t host);
 double SIMIX_host_get_available_speed(sg_host_t host);
 int SIMIX_host_get_state(sg_host_t host);
-void SIMIX_host_on(sg_host_t host);
-void SIMIX_host_off(sg_host_t host, smx_process_t issuer);
 double SIMIX_host_get_current_power_peak(sg_host_t host);
 double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index);
 int SIMIX_host_get_nb_pstates(sg_host_t host);
@@ -51,20 +49,19 @@ double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate);
 double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate);
 void SIMIX_host_set_pstate(sg_host_t host, int pstate_index);
 int SIMIX_host_get_pstate(sg_host_t host);
-smx_synchro_t SIMIX_host_execute(const char *name,
-    sg_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask);
-smx_synchro_t SIMIX_host_parallel_execute(const char *name,
+smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
+    double flops_amount, double priority, double bound, unsigned long affinity_mask);
+smx_synchro_t SIMIX_process_parallel_execute(const char *name,
     int host_nb, sg_host_t *host_list,
     double *flops_amount, double *bytes_amount,
     double amount, double rate);
-void SIMIX_host_execution_destroy(smx_synchro_t synchro);
-void SIMIX_host_execution_cancel(smx_synchro_t synchro);
-double SIMIX_host_execution_get_remains(smx_synchro_t synchro);
-e_smx_state_t SIMIX_host_execution_get_state(smx_synchro_t synchro);
-void SIMIX_host_execution_set_priority(smx_synchro_t synchro, double priority);
-void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound);
-void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask);
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host);
+void SIMIX_process_execution_destroy(smx_synchro_t synchro);
+void SIMIX_process_execution_cancel(smx_synchro_t synchro);
+double SIMIX_process_execution_get_remains(smx_synchro_t synchro);
+e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro);
+void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority);
+void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound);
+void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask);
 xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host);
 
 void SIMIX_host_execution_suspend(smx_synchro_t synchro);
@@ -103,9 +100,9 @@ void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mas
 
 void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm);
 
-void SIMIX_host_get_params(sg_host_t ind_vm, ws_params_t params);
+void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params);
 
-void SIMIX_host_set_params(sg_host_t ind_vm, ws_params_t params);
+void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params);
 
 SG_END_DECL()