move parts of the kernel to the right subdir

[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 0709849..4505f98 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -7,11 +7,15 @@
 #ifndef _SIMIX_HOST_PRIVATE_H
 #define _SIMIX_HOST_PRIVATE_H
 
+#include <functional>
+
 #include <xbt/base.h>
 
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
+#include "src/kernel/activity/SynchroExec.hpp"
+
 SG_BEGIN_DECL()
 
 /** @brief Host datatype from SIMIX POV */
@@ -27,39 +31,28 @@ XBT_PRIVATE void SIMIX_host_destroy(void *host);
 
 XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host,
                                          const char *name,
-                                         xbt_main_func_t code,
+                                         std::function<void()> code,
                                          void *data,
                                          const char *hostname,
                                          double kill_time,
-                                         int argc, char **argv,
                                          xbt_dict_t properties,
                                          int auto_restart);
 
 XBT_PRIVATE void SIMIX_host_restart_processes(sg_host_t host);
 XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host);
-XBT_PRIVATE xbt_dict_t SIMIX_host_get_properties(sg_host_t host);
-XBT_PRIVATE xbt_swag_t SIMIX_host_get_process_list(sg_host_t host);
-XBT_PRIVATE double SIMIX_host_get_current_power_peak(sg_host_t host);
-XBT_PRIVATE double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index);
-XBT_PRIVATE smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
+XBT_PRIVATE smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
     double flops_amount, double priority, double bound, unsigned long affinity_mask);
-XBT_PRIVATE smx_synchro_t SIMIX_process_parallel_execute(const char *name,
+XBT_PRIVATE smx_synchro_t SIMIX_execution_parallel_start(const char *name,
     int host_nb, sg_host_t *host_list,
     double *flops_amount, double *bytes_amount,
     double amount, double rate);
-XBT_PRIVATE void SIMIX_process_execution_destroy(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_process_execution_cancel(smx_synchro_t synchro);
-XBT_PRIVATE double SIMIX_process_execution_get_remains(smx_synchro_t synchro);
-XBT_PRIVATE e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority);
-XBT_PRIVATE void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound);
-XBT_PRIVATE void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask);
-XBT_PRIVATE xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host);
-
-XBT_PRIVATE void SIMIX_host_execution_suspend(smx_synchro_t synchro);
-XBT_PRIVATE void SIMIX_host_execution_resume(smx_synchro_t synchro);
-
-XBT_PRIVATE void SIMIX_post_host_execute(smx_synchro_t synchro);
+XBT_PRIVATE void SIMIX_execution_cancel(smx_synchro_t synchro);
+XBT_PRIVATE void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority);
+XBT_PRIVATE void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound);
+XBT_PRIVATE void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask);
+
+XBT_PRIVATE void SIMIX_execution_finish(simgrid::simix::Exec *exec);
+
 XBT_PRIVATE void SIMIX_set_category(smx_synchro_t synchro, const char *category);
 
 /* vm related stuff */
@@ -92,10 +85,6 @@ XBT_PRIVATE void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsig
 
 XBT_PRIVATE void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm);
 
-XBT_PRIVATE void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params);
-
-XBT_PRIVATE void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params);
-
 SG_END_DECL()
 
 #endif