From 7d9b0d746cf454cac6d5f6068ebd7ba53ba95a5f Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Tue, 29 Sep 2015 14:55:07 +0200 Subject: [PATCH] Mark some internal symbols as hidden on ELF in simix --- src/simix/popping_accessors.h | 104 ++++++++++++++++---------------- src/simix/popping_generated.c | 1 + src/simix/popping_private.h | 10 +-- src/simix/simcalls.py | 3 +- src/simix/smx_host_private.h | 102 ++++++++++++++++--------------- src/simix/smx_io_private.h | 44 +++++++------- src/simix/smx_network_private.h | 46 +++++++------- src/simix/smx_private.h | 27 +++++---- src/simix/smx_process_private.h | 68 +++++++++++---------- src/simix/smx_synchro_private.h | 39 ++++++------ 10 files changed, 229 insertions(+), 215 deletions(-) diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h index 75b3d05a08..951504c58e 100644 --- a/src/simix/popping_accessors.h +++ b/src/simix/popping_accessors.h @@ -1942,61 +1942,61 @@ static inline void simcall_mc_compare_snapshots__set__result(smx_simcall_t simca /* The prototype of all simcall handlers, automatically generated for you */ -void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t host); -void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm); -void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm); -void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm); -void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm); -void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm); -void* simcall_HANDLER_process_create(smx_simcall_t simcall, const char* name, xbt_main_func_t code, void* data, const char* hostname, double kill_time, int argc, char** argv, xbt_dict_t properties, int auto_restart); -void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process); -void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid); -void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process); -void simcall_HANDLER_process_resume(smx_simcall_t simcall, smx_process_t process); -void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t process, sg_host_t dest); -void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout); -void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration); -smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall, const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask); -void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t execution); -smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process_t process); -smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv, int type, int src, int tag, simix_match_func_t match_fun, void* data); -void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout); -smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached); -void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate); -smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate); -void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms); -void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t comm, double timeout); -void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t comm); -void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t comms); -smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall); -void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex); -int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex); -void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex); -void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex); -void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout); -void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem); -int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem); -void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem); -void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout); -int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem); -void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host); -void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host); -void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host); -void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host); -sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd); -sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd); -int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin); -xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd); -int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t fd, const char* fullpath); -sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage); -sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t name); -xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char* name); -int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max); +XBT_PRIVATE void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t host); +XBT_PRIVATE void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm); +XBT_PRIVATE void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm); +XBT_PRIVATE void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm); +XBT_PRIVATE void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm); +XBT_PRIVATE void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm); +XBT_PRIVATE void* simcall_HANDLER_process_create(smx_simcall_t simcall, const char* name, xbt_main_func_t code, void* data, const char* hostname, double kill_time, int argc, char** argv, xbt_dict_t properties, int auto_restart); +XBT_PRIVATE void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process); +XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid); +XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process); +XBT_PRIVATE void simcall_HANDLER_process_resume(smx_simcall_t simcall, smx_process_t process); +XBT_PRIVATE void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t process, sg_host_t dest); +XBT_PRIVATE void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout); +XBT_PRIVATE void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration); +XBT_PRIVATE smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall, const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask); +XBT_PRIVATE void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t execution); +XBT_PRIVATE smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process_t process); +XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv, int type, int src, int tag, simix_match_func_t match_fun, void* data); +XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout); +XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sender, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached); +XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate); +XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate); +XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms); +XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t comm, double timeout); +XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t comm); +XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t comms); +XBT_PRIVATE smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall); +XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex); +XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex); +XBT_PRIVATE void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex); +XBT_PRIVATE void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex); +XBT_PRIVATE void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout); +XBT_PRIVATE void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem); +XBT_PRIVATE int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem); +XBT_PRIVATE void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem); +XBT_PRIVATE void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout); +XBT_PRIVATE int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem); +XBT_PRIVATE void simcall_HANDLER_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host); +XBT_PRIVATE void simcall_HANDLER_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, sg_host_t host); +XBT_PRIVATE void simcall_HANDLER_file_open(smx_simcall_t simcall, const char* fullpath, sg_host_t host); +XBT_PRIVATE void simcall_HANDLER_file_close(smx_simcall_t simcall, smx_file_t fd, sg_host_t host); +XBT_PRIVATE sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd); +XBT_PRIVATE sg_size_t simcall_HANDLER_file_tell(smx_simcall_t simcall, smx_file_t fd); +XBT_PRIVATE int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin); +XBT_PRIVATE xbt_dynar_t simcall_HANDLER_file_get_info(smx_simcall_t simcall, smx_file_t fd); +XBT_PRIVATE int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t fd, const char* fullpath); +XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage); +XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t name); +XBT_PRIVATE xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char* name); +XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max); #ifdef HAVE_LATENCY_BOUND_TRACKING #endif #ifdef HAVE_MC -mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall); -int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2); +XBT_PRIVATE mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall); +XBT_PRIVATE int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2); #endif diff --git a/src/simix/popping_generated.c b/src/simix/popping_generated.c index 76752d7792..a2901489ba 100644 --- a/src/simix/popping_generated.c +++ b/src/simix/popping_generated.c @@ -13,6 +13,7 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ +#include #include "smx_private.h" #ifdef HAVE_MC #include "mc/mc_forward.h" diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h index cedca92603..26e3662659 100644 --- a/src/simix/popping_private.h +++ b/src/simix/popping_private.h @@ -7,6 +7,8 @@ #ifndef _POPPING_PRIVATE_H #define _POPPING_PRIVATE_H +#include + SG_BEGIN_DECL() /********************************* Simcalls *********************************/ @@ -59,10 +61,10 @@ typedef struct s_smx_simcall { /******************************** General *************************************/ -void SIMIX_simcall_answer(smx_simcall_t); -void SIMIX_simcall_handle(smx_simcall_t, int); -void SIMIX_simcall_exit(smx_synchro_t); -const char *SIMIX_simcall_name(e_smx_simcall_t kind); +XBT_PRIVATE void SIMIX_simcall_answer(smx_simcall_t); +XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t, int); +XBT_PRIVATE void SIMIX_simcall_exit(smx_synchro_t); +XBT_PRIVATE const char *SIMIX_simcall_name(e_smx_simcall_t kind); SG_END_DECL() diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index f7f776d997..aa2a54d25a 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -177,7 +177,7 @@ class Simcall(object): def handler_prototype(self): if self.need_handler: - return "%s simcall_HANDLER_%s(smx_simcall_t simcall%s);"%(self.res.rettype() if self.call_kind == 'Func' else 'void', + return "XBT_PRIVATE %s simcall_HANDLER_%s(smx_simcall_t simcall%s);"%(self.res.rettype() if self.call_kind == 'Func' else 'void', self.name, ''.join(', %s %s'%(arg.rettype(), arg.name) for i, arg in enumerate(self.args))) @@ -279,6 +279,7 @@ if __name__=='__main__': fd = header("popping_generated.c") + fd.write('#include \n'); fd.write('#include "smx_private.h"\n'); fd.write('#ifdef HAVE_MC\n'); fd.write('#include "mc/mc_forward.h"\n'); diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 471f3edf41..b0154cbdcc 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -7,6 +7,8 @@ #ifndef _SIMIX_HOST_PRIVATE_H #define _SIMIX_HOST_PRIVATE_H +#include + #include "simgrid/simix.h" #include "popping_private.h" @@ -19,11 +21,11 @@ typedef struct s_smx_host_priv { xbt_dynar_t boot_processes; } s_smx_host_priv_t; -void _SIMIX_host_free_process_arg(void *); -void SIMIX_host_create(const char *name); -void SIMIX_host_destroy(void *host); +XBT_PRIVATE void _SIMIX_host_free_process_arg(void *); +XBT_PRIVATE void SIMIX_host_create(const char *name); +XBT_PRIVATE void SIMIX_host_destroy(void *host); -void SIMIX_host_add_auto_restart_process(sg_host_t host, +XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, const char *name, xbt_main_func_t code, void *data, @@ -33,76 +35,76 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, xbt_dict_t properties, int auto_restart); -void SIMIX_host_restart_processes(sg_host_t host); -void SIMIX_host_autorestart(sg_host_t host); -xbt_dict_t SIMIX_host_get_properties(sg_host_t host); -int SIMIX_host_get_core(sg_host_t host); -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); -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); -double SIMIX_host_get_consumed_energy(sg_host_t host); -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_process_execute(smx_process_t issuer, const char *name, +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 int SIMIX_host_get_core(sg_host_t host); +XBT_PRIVATE xbt_swag_t SIMIX_host_get_process_list(sg_host_t host); +XBT_PRIVATE double SIMIX_host_get_speed(sg_host_t host); +XBT_PRIVATE double SIMIX_host_get_available_speed(sg_host_t host); +XBT_PRIVATE int SIMIX_host_get_state(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 int SIMIX_host_get_nb_pstates(sg_host_t host); +XBT_PRIVATE double SIMIX_host_get_consumed_energy(sg_host_t host); +XBT_PRIVATE double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate); +XBT_PRIVATE double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate); +XBT_PRIVATE void SIMIX_host_set_pstate(sg_host_t host, int pstate_index); +XBT_PRIVATE int SIMIX_host_get_pstate(sg_host_t host); +XBT_PRIVATE 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, +XBT_PRIVATE 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_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); +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); -void SIMIX_host_execution_suspend(smx_synchro_t synchro); -void SIMIX_host_execution_resume(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_host_execution_suspend(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_host_execution_resume(smx_synchro_t synchro); -void SIMIX_post_host_execute(smx_synchro_t synchro); -void SIMIX_set_category(smx_synchro_t synchro, const char *category); +XBT_PRIVATE void SIMIX_post_host_execute(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_set_category(smx_synchro_t synchro, const char *category); /* vm related stuff */ -sg_host_t SIMIX_vm_create(const char *name, sg_host_t ind_phys_host); +XBT_PRIVATE sg_host_t SIMIX_vm_create(const char *name, sg_host_t ind_phys_host); -void SIMIX_vm_destroy(sg_host_t ind_vm); +XBT_PRIVATE void SIMIX_vm_destroy(sg_host_t ind_vm); // -- -void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer); +XBT_PRIVATE void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer); -void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer); +XBT_PRIVATE void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer); // -- -void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer); +XBT_PRIVATE void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer); -void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer); +XBT_PRIVATE void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer); // -- -void SIMIX_vm_start(sg_host_t ind_vm); +XBT_PRIVATE void SIMIX_vm_start(sg_host_t ind_vm); -void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer); +XBT_PRIVATE void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer); // -- -int SIMIX_vm_get_state(sg_host_t ind_vm); +XBT_PRIVATE int SIMIX_vm_get_state(sg_host_t ind_vm); // -- -void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm); +XBT_PRIVATE void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm); -void *SIMIX_vm_get_pm(sg_host_t ind_vm); +XBT_PRIVATE void *SIMIX_vm_get_pm(sg_host_t ind_vm); -void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound); +XBT_PRIVATE void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound); -void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mask); +XBT_PRIVATE void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mask); -void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm); +XBT_PRIVATE 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, vm_params_t params); +XBT_PRIVATE void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params); -void SIMIX_host_set_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() diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h index e0e6b79f10..7071717b0d 100644 --- a/src/simix/smx_io_private.h +++ b/src/simix/smx_io_private.h @@ -7,6 +7,8 @@ #ifndef _SIMIX_IO_PRIVATE_H #define _SIMIX_IO_PRIVATE_H +#include + #include "simgrid/simix.h" #include "popping_private.h" @@ -20,26 +22,26 @@ static inline smx_storage_priv_t SIMIX_storage_priv(smx_storage_t storage){ return (smx_storage_priv_t) xbt_lib_get_level(storage, SIMIX_STORAGE_LEVEL); } -smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data); -void SIMIX_storage_destroy(void *s); -smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host); -smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host); -smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host); -smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host); -int SIMIX_file_unlink(smx_file_t fd, sg_host_t host); -sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd); -sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd); -xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd); -int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin); -int SIMIX_file_move(smx_process_t process, smx_file_t fd, const char* fullpath); - -sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage); -sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage); - -xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage); - -void SIMIX_post_io(smx_synchro_t synchro); -void SIMIX_io_destroy(smx_synchro_t synchro); -void SIMIX_io_finish(smx_synchro_t synchro); +XBT_PRIVATE smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data); +XBT_PRIVATE void SIMIX_storage_destroy(void *s); +XBT_PRIVATE smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, sg_host_t host); +XBT_PRIVATE smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, sg_host_t host); +XBT_PRIVATE smx_synchro_t SIMIX_file_open(const char* fullpath, sg_host_t host); +XBT_PRIVATE smx_synchro_t SIMIX_file_close(smx_file_t fd, sg_host_t host); +XBT_PRIVATE int SIMIX_file_unlink(smx_file_t fd, sg_host_t host); +XBT_PRIVATE sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd); +XBT_PRIVATE sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd); +XBT_PRIVATE xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd); +XBT_PRIVATE int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin); +XBT_PRIVATE int SIMIX_file_move(smx_process_t process, smx_file_t fd, const char* fullpath); + +XBT_PRIVATE sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage); +XBT_PRIVATE sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage); + +XBT_PRIVATE xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage); + +XBT_PRIVATE void SIMIX_post_io(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_io_destroy(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_io_finish(smx_synchro_t synchro); #endif diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index 93778b104e..0177f06414 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -7,6 +7,8 @@ #ifndef _SIMIX_NETWORK_PRIVATE_H #define _SIMIX_NETWORK_PRIVATE_H +#include + #include "simgrid/simix.h" #include "popping_private.h" @@ -19,38 +21,38 @@ typedef struct s_smx_rvpoint { xbt_fifo_t done_comm_fifo;//messages already received in the permanent receive mode } s_smx_rvpoint_t; -void SIMIX_network_init(void); -void SIMIX_network_exit(void); +XBT_PRIVATE void SIMIX_network_init(void); +XBT_PRIVATE void SIMIX_network_exit(void); #ifdef HAVE_LATENCY_BOUND_TRACKING XBT_PUBLIC(int) SIMIX_comm_is_latency_bounded(smx_synchro_t comm); #endif -smx_rdv_t SIMIX_rdv_create(const char *name); -void SIMIX_rdv_destroy(smx_rdv_t rdv); -smx_rdv_t SIMIX_rdv_get_by_name(const char *name); -void SIMIX_rdv_remove(smx_rdv_t rdv, smx_synchro_t comm); -int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host); -smx_synchro_t SIMIX_rdv_get_head(smx_rdv_t rdv); -void SIMIX_rdv_set_receiver(smx_rdv_t rdv, smx_process_t proc); -smx_process_t SIMIX_rdv_get_receiver(smx_rdv_t rdv); -smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, +XBT_PRIVATE smx_rdv_t SIMIX_rdv_create(const char *name); +XBT_PRIVATE void SIMIX_rdv_destroy(smx_rdv_t rdv); +XBT_PRIVATE smx_rdv_t SIMIX_rdv_get_by_name(const char *name); +XBT_PRIVATE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_synchro_t comm); +XBT_PRIVATE int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host); +XBT_PRIVATE smx_synchro_t SIMIX_rdv_get_head(smx_rdv_t rdv); +XBT_PRIVATE void SIMIX_rdv_set_receiver(smx_rdv_t rdv, smx_process_t proc); +XBT_PRIVATE smx_process_t SIMIX_rdv_get_receiver(smx_rdv_t rdv); +XBT_PRIVATE smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, int (*)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double rate); -void SIMIX_comm_destroy(smx_synchro_t synchro); -void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro); -smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int type, int src, +XBT_PRIVATE void SIMIX_comm_destroy(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro); +XBT_PRIVATE smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int type, int src, int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data); -void SIMIX_post_comm(smx_synchro_t synchro); -void SIMIX_comm_cancel(smx_synchro_t synchro); -double SIMIX_comm_get_remains(smx_synchro_t synchro); -e_smx_state_t SIMIX_comm_get_state(smx_synchro_t synchro); -void SIMIX_comm_suspend(smx_synchro_t synchro); -void SIMIX_comm_resume(smx_synchro_t synchro); -smx_process_t SIMIX_comm_get_src_proc(smx_synchro_t synchro); -smx_process_t SIMIX_comm_get_dst_proc(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_post_comm(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_comm_cancel(smx_synchro_t synchro); +XBT_PRIVATE double SIMIX_comm_get_remains(smx_synchro_t synchro); +XBT_PRIVATE e_smx_state_t SIMIX_comm_get_state(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_comm_suspend(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_comm_resume(smx_synchro_t synchro); +XBT_PRIVATE smx_process_t SIMIX_comm_get_src_proc(smx_synchro_t synchro); +XBT_PRIVATE smx_process_t SIMIX_comm_get_dst_proc(smx_synchro_t synchro); #endif diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index dbd51adbf0..d908a7d326 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -9,6 +9,7 @@ #include "simgrid/simix.h" #include "surf/surf.h" +#include "xbt/base.h" #include "xbt/fifo.h" #include "xbt/swag.h" #include "xbt/dict.h" @@ -34,7 +35,7 @@ SG_BEGIN_DECL() //#define TIME_BENCH_ENTIRE_SRS /* more general benchmark than TIME_BENCH_PER_SR. It aims to measure the total time spent in a whole scheduling round (including synchro costs)*/ #ifdef TIME_BENCH_PER_SR -void smx_ctx_raw_new_sr(void); +XBT_PRIVATE void smx_ctx_raw_new_sr(void); #endif /********************************** Simix Global ******************************/ typedef struct s_smx_global { @@ -61,7 +62,7 @@ typedef struct s_smx_global { } s_smx_global_t, *smx_global_t; XBT_PUBLIC_DATA(smx_global_t) simix_global; -extern unsigned long simix_process_maxpid; +extern XBT_PRIVATE unsigned long simix_process_maxpid; XBT_PUBLIC(void) SIMIX_clean(void); @@ -193,8 +194,8 @@ typedef struct s_smx_synchro { char *category; /* simix action category for instrumentation */ } s_smx_synchro_t; -void SIMIX_context_mod_init(void); -void SIMIX_context_mod_exit(void); +XBT_PRIVATE void SIMIX_context_mod_init(void); +XBT_PRIVATE void SIMIX_context_mod_exit(void); #ifndef WIN32 XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); @@ -210,18 +211,18 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); # define smx_context_usable_stack_size smx_context_stack_size #endif -void *SIMIX_context_stack_new(void); -void SIMIX_context_stack_delete(void *stack); +XBT_PRIVATE void *SIMIX_context_stack_new(void); +XBT_PRIVATE void SIMIX_context_stack_delete(void *stack); -void SIMIX_context_set_current(smx_context_t context); -smx_context_t SIMIX_context_get_current(void); +XBT_PRIVATE void SIMIX_context_set_current(smx_context_t context); +XBT_PRIVATE smx_context_t SIMIX_context_get_current(void); /* All factories init */ -void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory); -void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); -void SIMIX_ctx_boost_factory_init(smx_context_factory_t *factory); +XBT_PRIVATE void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); +XBT_PRIVATE void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory); +XBT_PRIVATE void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); +XBT_PRIVATE void SIMIX_ctx_boost_factory_init(smx_context_factory_t *factory); /* ****************************** */ /* context manipulation functions */ @@ -327,7 +328,7 @@ static XBT_INLINE smx_process_t SIMIX_context_get_process(smx_context_t context) XBT_PUBLIC(int) SIMIX_process_get_maxpid(void); -void SIMIX_post_create_environment(void); +XBT_PRIVATE void SIMIX_post_create_environment(void); SG_END_DECL() diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h index 6d19ddd705..f5379255a4 100644 --- a/src/simix/smx_process_private.h +++ b/src/simix/smx_process_private.h @@ -7,6 +7,8 @@ #ifndef _SIMIX_PROCESS_PRIVATE_H #define _SIMIX_PROCESS_PRIVATE_H +#include + #include "simgrid/simix.h" #include "popping_private.h" @@ -62,7 +64,7 @@ typedef struct s_smx_process { } s_smx_process_t; -smx_process_t SIMIX_process_create( +XBT_PRIVATE smx_process_t SIMIX_process_create( const char *name, xbt_main_func_t code, void *data, @@ -72,39 +74,39 @@ smx_process_t SIMIX_process_create( xbt_dict_t properties, int auto_restart, smx_process_t parent_process); -void SIMIX_process_runall(void); -void SIMIX_process_kill(smx_process_t process, smx_process_t issuer); -void SIMIX_process_killall(smx_process_t issuer, int reset_pid); -smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args); -void SIMIX_create_maestro_process(void); -void SIMIX_process_stop(smx_process_t arg); -void SIMIX_process_cleanup(smx_process_t arg); -void SIMIX_process_empty_trash(void); -void SIMIX_process_yield(smx_process_t self); -xbt_running_ctx_t *SIMIX_process_get_running_context(void); -void SIMIX_process_exception_terminate(xbt_ex_t * e); -void SIMIX_process_change_host(smx_process_t process, +XBT_PRIVATE void SIMIX_process_runall(void); +XBT_PRIVATE void SIMIX_process_kill(smx_process_t process, smx_process_t issuer); +XBT_PRIVATE void SIMIX_process_killall(smx_process_t issuer, int reset_pid); +XBT_PRIVATE smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args); +XBT_PRIVATE void SIMIX_create_maestro_process(void); +XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg); +XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg); +XBT_PRIVATE void SIMIX_process_empty_trash(void); +XBT_PRIVATE void SIMIX_process_yield(smx_process_t self); +XBT_PRIVATE xbt_running_ctx_t *SIMIX_process_get_running_context(void); +XBT_PRIVATE void SIMIX_process_exception_terminate(xbt_ex_t * e); +XBT_PRIVATE void SIMIX_process_change_host(smx_process_t process, sg_host_t dest); -smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer); -void SIMIX_process_resume(smx_process_t process, smx_process_t issuer); -int SIMIX_process_get_PID(smx_process_t self); -int SIMIX_process_get_PPID(smx_process_t self); -void* SIMIX_process_get_data(smx_process_t process); -void SIMIX_process_set_data(smx_process_t process, void *data); -sg_host_t SIMIX_process_get_host(smx_process_t process); -const char* SIMIX_process_get_name(smx_process_t process); -smx_process_t SIMIX_process_get_by_name(const char* name); -int SIMIX_process_is_suspended(smx_process_t process); -xbt_dict_t SIMIX_process_get_properties(smx_process_t process); -smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout); -smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration); -void SIMIX_post_process_sleep(smx_synchro_t synchro); - -void SIMIX_process_sleep_suspend(smx_synchro_t synchro); -void SIMIX_process_sleep_resume(smx_synchro_t synchro); -void SIMIX_process_sleep_destroy(smx_synchro_t synchro); -void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart); -smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer); +XBT_PRIVATE smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer); +XBT_PRIVATE void SIMIX_process_resume(smx_process_t process, smx_process_t issuer); +XBT_PRIVATE int SIMIX_process_get_PID(smx_process_t self); +XBT_PRIVATE int SIMIX_process_get_PPID(smx_process_t self); +XBT_PRIVATE void* SIMIX_process_get_data(smx_process_t process); +XBT_PRIVATE void SIMIX_process_set_data(smx_process_t process, void *data); +XBT_PRIVATE sg_host_t SIMIX_process_get_host(smx_process_t process); +XBT_PRIVATE const char* SIMIX_process_get_name(smx_process_t process); +XBT_PRIVATE smx_process_t SIMIX_process_get_by_name(const char* name); +XBT_PRIVATE int SIMIX_process_is_suspended(smx_process_t process); +XBT_PRIVATE xbt_dict_t SIMIX_process_get_properties(smx_process_t process); +XBT_PRIVATE smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout); +XBT_PRIVATE smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration); +XBT_PRIVATE void SIMIX_post_process_sleep(smx_synchro_t synchro); + +XBT_PRIVATE void SIMIX_process_sleep_suspend(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_process_sleep_resume(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart); +XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer); SG_END_DECL() diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h index 9907e4176c..d6da8045f7 100644 --- a/src/simix/smx_synchro_private.h +++ b/src/simix/smx_synchro_private.h @@ -7,6 +7,7 @@ #ifndef _SIMIX_SYNCHRO_PRIVATE_H #define _SIMIX_SYNCHRO_PRIVATE_H +#include "xbt/base.h" #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" @@ -26,24 +27,24 @@ typedef struct s_smx_sem { xbt_swag_t sleeping; /* list of sleeping process */ } s_smx_sem_t; -void SIMIX_post_synchro(smx_synchro_t synchro); -void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall); -void SIMIX_synchro_destroy(smx_synchro_t synchro); - -smx_mutex_t SIMIX_mutex_init(void); -void SIMIX_mutex_destroy(smx_mutex_t mutex); -int SIMIX_mutex_trylock(smx_mutex_t mutex, smx_process_t issuer); -void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer); - -smx_cond_t SIMIX_cond_init(void); -void SIMIX_cond_destroy(smx_cond_t cond); -void SIMIX_cond_signal(smx_cond_t cond); -void SIMIX_cond_broadcast(smx_cond_t cond); - -smx_sem_t SIMIX_sem_init(unsigned int value); -void SIMIX_sem_destroy(smx_sem_t sem); -void SIMIX_sem_release(smx_sem_t sem); -int SIMIX_sem_would_block(smx_sem_t sem); -int SIMIX_sem_get_capacity(smx_sem_t sem); +XBT_PRIVATE void SIMIX_post_synchro(smx_synchro_t synchro); +XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall); +XBT_PRIVATE void SIMIX_synchro_destroy(smx_synchro_t synchro); + +XBT_PRIVATE smx_mutex_t SIMIX_mutex_init(void); +XBT_PRIVATE void SIMIX_mutex_destroy(smx_mutex_t mutex); +XBT_PRIVATE int SIMIX_mutex_trylock(smx_mutex_t mutex, smx_process_t issuer); +XBT_PRIVATE void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer); + +XBT_PRIVATE smx_cond_t SIMIX_cond_init(void); +XBT_PRIVATE void SIMIX_cond_destroy(smx_cond_t cond); +XBT_PRIVATE void SIMIX_cond_broadcast(smx_cond_t cond); +XBT_PRIVATE void SIMIX_cond_signal(smx_cond_t cond); + +XBT_PRIVATE void SIMIX_sem_destroy(smx_sem_t sem); +XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value); +XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem); +XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem); +XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem); #endif -- 2.20.1