X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efb4f45908f62882ef6ebd34742f29d079d99736..f2df13795e01302813a6aef10825ec7e922ce530:/src/simix/smx_host_private.h diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 7ce4beb4e8..2e17bcf1cc 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2012-2013. The SimGrid Team. +/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -17,7 +17,6 @@ typedef struct s_smx_host_priv { xbt_swag_t process_list; xbt_dynar_t auto_restart_processes; xbt_dynar_t boot_processes; - void *data; /**< @brief user data */ } s_smx_host_priv_t; static inline smx_host_priv_t SIMIX_host_priv(smx_host_t host){ @@ -67,8 +66,8 @@ void SIMIX_host_execution_set_priority(smx_action_t action, double priority); void SIMIX_host_execution_set_bound(smx_action_t action, double bound); void SIMIX_host_execution_set_affinity(smx_action_t action, smx_host_t host, unsigned long mask); void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action); -xbt_dict_t SIMIX_host_get_storage_list(smx_host_t host); - +xbt_dict_t SIMIX_host_get_mounted_storage_list(smx_host_t host); +xbt_dynar_t SIMIX_host_get_attached_storage_list(smx_host_t host); // pre prototypes smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t, const char*); const char* SIMIX_pre_host_self_get_name(smx_simcall_t); @@ -87,8 +86,6 @@ int SIMIX_pre_host_get_nb_pstates(smx_simcall_t, smx_host_t host); void SIMIX_pre_host_set_power_peak_at(smx_simcall_t, smx_host_t host, int pstate_index); double SIMIX_pre_host_get_consumed_energy(smx_simcall_t, smx_host_t); void* SIMIX_pre_host_self_get_data(smx_simcall_t); -void* SIMIX_pre_host_get_data(smx_simcall_t, smx_host_t); -void SIMIX_pre_host_set_data(smx_simcall_t, smx_host_t, void*); smx_action_t SIMIX_pre_host_execute(smx_simcall_t, const char*, smx_host_t, double, double, double, unsigned long); smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t, const char*, int, smx_host_t*, double*, double*, double, double); @@ -104,7 +101,8 @@ void SIMIX_host_execution_suspend(smx_action_t action); void SIMIX_host_execution_resume(smx_action_t action); void SIMIX_post_host_execute(smx_action_t action); -xbt_dict_t SIMIX_pre_host_get_storage_list(smx_simcall_t, smx_host_t); +xbt_dict_t SIMIX_pre_host_get_mounted_storage_list(smx_simcall_t, smx_host_t); +xbt_dynar_t SIMIX_pre_host_get_attached_storage_list(smx_simcall_t, smx_host_t); #ifdef HAVE_TRACING void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action, const char *category); @@ -135,8 +133,6 @@ void SIMIX_pre_vm_start(smx_simcall_t simcall, smx_host_t ind_vm); void SIMIX_vm_shutdown(smx_host_t ind_vm, smx_process_t issuer); void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm); // -- -void SIMIX_vm_set_state(smx_host_t ind_vm, int state); -void SIMIX_pre_vm_set_state(smx_simcall_t simcall, smx_host_t ind_vm, int state); int SIMIX_vm_get_state(smx_host_t ind_vm); int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm);