ignore some cruft generated by scala

[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 2895f7b..d204997 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -12,19 +12,15 @@
 
 SG_BEGIN_DECL()
 
-/** @brief Host datatype */
+/** @brief Host datatype from SIMIX POV */
 typedef struct s_smx_host_priv {
   xbt_swag_t process_list;
   xbt_dynar_t auto_restart_processes;
-  xbt_dynar_t boot_processes; 
+  xbt_dynar_t boot_processes;
 } s_smx_host_priv_t;
 
-static inline smx_host_priv_t SIMIX_host_priv(sg_host_t host){
-  return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
-}
-
 void _SIMIX_host_free_process_arg(void *);
-sg_host_t SIMIX_host_create(const char *name, void *data);
+void SIMIX_host_create(const char *name);
 void SIMIX_host_destroy(void *host);
 
 void SIMIX_host_add_auto_restart_process(sg_host_t host,
@@ -55,19 +51,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);
+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_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host);
 xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host);
 
@@ -107,9 +103,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()