Compilation is at least ok - Ad(rien)

[simgrid.git] / src / simix / smx_host_private.h

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 33316bd..f9c58eb 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -53,10 +53,10 @@ int SIMIX_host_get_nb_pstates(smx_host_t host);
 double SIMIX_host_get_consumed_energy(smx_host_t host);
 void SIMIX_host_set_power_peak_at(smx_host_t host, int pstate_index);
 smx_synchro_t SIMIX_host_execute(const char *name,
-    smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask);
+    smx_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask);
 smx_synchro_t SIMIX_host_parallel_execute(const char *name,
     int host_nb, smx_host_t *host_list,
-    double *computation_amount, double *communication_amount,
+    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);
@@ -72,9 +72,8 @@ void SIMIX_host_execution_suspend(smx_synchro_t synchro);
 void SIMIX_host_execution_resume(smx_synchro_t synchro);
 
 void SIMIX_post_host_execute(smx_synchro_t synchro);
-#ifdef HAVE_TRACING
 void SIMIX_set_category(smx_synchro_t synchro, const char *category);
-#endif
+
 /* vm related stuff */
 smx_host_t SIMIX_vm_create(const char *name, smx_host_t ind_phys_host);
 
@@ -103,6 +102,8 @@ void SIMIX_vm_set_bound(smx_host_t ind_vm, double bound);
 
 void SIMIX_vm_set_affinity(smx_host_t ind_vm, smx_host_t ind_pm, unsigned long mask);
 
+void SIMIX_vm_migratefrom_resumeto(smx_host_t vm, smx_host_t src_pm, smx_host_t dst_pm);
+
 void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params);
 
 void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params);