From e2c10f61cfd4d58faa73f006aa74def2c73c8860 Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 6 Oct 2006 15:05:24 +0000 Subject: [PATCH] Only adds the XBT_PUBLIC macro decoration a the begining of the public API functions. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2874 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/amok/bandwidth.h | 16 +++---- include/amok/base.h | 4 +- include/amok/peermanagement.h | 24 +++++----- include/gras.h | 4 +- include/gras/datadesc.h | 90 +++++++++++++++++------------------ include/gras/emul.h | 12 ++--- include/gras/messages.h | 44 ++++++++--------- include/gras/module.h | 8 ++-- include/gras/process.h | 8 ++-- include/gras/timer.h | 14 +++--- include/gras/transport.h | 34 ++++++------- include/gras/virtu.h | 10 ++-- include/xbt/peer.h | 10 ++-- include/xbt/set.h | 28 +++++------ include/xbt/swag.h | 20 ++++---- include/xbt/sysdep.h | 6 +-- src/gras_modinter.h | 28 +++++------ src/surf/surf_private.h | 18 +++---- src/xbt/dict_private.h | 12 ++--- src/xbt/ex_interface.h | 2 +- src/xbt_modinter.h | 8 ++-- 21 files changed, 200 insertions(+), 200 deletions(-) diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h index 0976f95ac3..a0aed3c85b 100644 --- a/include/amok/bandwidth.h +++ b/include/amok/bandwidth.h @@ -89,21 +89,21 @@ /* module handling */ -void amok_bw_init(void); -void amok_bw_exit(void); +XBT_PUBLIC void amok_bw_init(void); +XBT_PUBLIC void amok_bw_exit(void); -void amok_bw_test(gras_socket_t peer, +XBT_PUBLIC void amok_bw_test(gras_socket_t peer, unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size, double min_duration, /*OUT*/ double *sec, double *bw); -void amok_bw_request(const char* from_name,unsigned int from_port, +XBT_PUBLIC void amok_bw_request(const char* from_name,unsigned int from_port, const char* to_name,unsigned int to_port, unsigned long int buf_size,unsigned long int exp_size,unsigned long int msg_size, double min_duration, /*OUT*/ double *sec, double*bw); -double * amok_bw_matrix(xbt_dynar_t hosts, /* dynar of xbt_host_t */ +XBT_PUBLIC double * amok_bw_matrix(xbt_dynar_t hosts, /* dynar of xbt_host_t */ int buf_size_bw, int exp_size_bw, int msg_size_bw, double min_duration); /* *************************************************************************** @@ -111,15 +111,15 @@ double * amok_bw_matrix(xbt_dynar_t hosts, /* dynar of xbt_host_t */ * ***************************************************************************/ -void amok_bw_saturate_start(const char* from_name,unsigned int from_port, +XBT_PUBLIC void amok_bw_saturate_start(const char* from_name,unsigned int from_port, const char* to_name,unsigned int to_port, unsigned int msg_size, double duration); -void amok_bw_saturate_begin(const char* to_name,unsigned int to_port, +XBT_PUBLIC void amok_bw_saturate_begin(const char* to_name,unsigned int to_port, unsigned int msg_size, double duration, /*out*/ double *elapsed, double *bw); -void amok_bw_saturate_stop(const char* from_name,unsigned int from_port, +XBT_PUBLIC void amok_bw_saturate_stop(const char* from_name,unsigned int from_port, /*out*/ double *time, double *bw); /** @} */ diff --git a/include/amok/base.h b/include/amok/base.h index 8a87862041..ae37bc01f6 100644 --- a/include/amok/base.h +++ b/include/amok/base.h @@ -27,8 +27,8 @@ typedef struct { double value; } amok_result_t; -void amok_base_init(void); -void amok_base_exit(void); +XBT_PUBLIC void amok_base_init(void); +XBT_PUBLIC void amok_base_exit(void); #endif /* AMOK_BASE_H */ diff --git a/include/amok/peermanagement.h b/include/amok/peermanagement.h index e0d7c0d0a3..bd7689b8a3 100644 --- a/include/amok/peermanagement.h +++ b/include/amok/peermanagement.h @@ -56,24 +56,24 @@ */ /* module handling */ -void amok_pm_init(void); -void amok_pm_exit(void); +XBT_PUBLIC void amok_pm_init(void); +XBT_PUBLIC void amok_pm_exit(void); -void amok_pm_mainloop(double timeOut); +XBT_PUBLIC void amok_pm_mainloop(double timeOut); -void amok_pm_kill_hp(char *name,int port); -void amok_pm_kill(gras_socket_t buddy); -void amok_pm_kill_sync(gras_socket_t buddy); +XBT_PUBLIC void amok_pm_kill_hp(char *name,int port); +XBT_PUBLIC void amok_pm_kill(gras_socket_t buddy); +XBT_PUBLIC void amok_pm_kill_sync(gras_socket_t buddy); -xbt_dynar_t amok_pm_group_new(const char *group_name); -xbt_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name); +XBT_PUBLIC xbt_dynar_t amok_pm_group_new(const char *group_name); +XBT_PUBLIC xbt_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name); -void amok_pm_group_join(gras_socket_t master, const char *group_name); -void amok_pm_group_leave(gras_socket_t master, const char *group_name); +XBT_PUBLIC void amok_pm_group_join(gras_socket_t master, const char *group_name); +XBT_PUBLIC void amok_pm_group_leave(gras_socket_t master, const char *group_name); -void amok_pm_group_shutdown(const char *group_name); -void amok_pm_group_shutdown_remote(gras_socket_t master, const char *group_name); +XBT_PUBLIC void amok_pm_group_shutdown(const char *group_name); +XBT_PUBLIC void amok_pm_group_shutdown_remote(gras_socket_t master, const char *group_name); /** @} */ diff --git a/include/gras.h b/include/gras.h index 8a67ddcd01..083e9d27ef 100644 --- a/include/gras.h +++ b/include/gras.h @@ -23,7 +23,7 @@ #include #include -void gras_init(int *argc, char **argv); -void gras_exit(void); +XBT_PUBLIC void gras_init(int *argc, char **argv); +XBT_PUBLIC void gras_exit(void); #endif /* GRAS_H */ diff --git a/include/gras/datadesc.h b/include/gras/datadesc.h index 63519bf754..037d19c662 100644 --- a/include/gras/datadesc.h +++ b/include/gras/datadesc.h @@ -59,7 +59,7 @@ SG_BEGIN_DECL() typedef struct s_gras_datadesc_type *gras_datadesc_type_t; /** \brief Search a type description from its name */ -gras_datadesc_type_t gras_datadesc_by_name(const char *name); +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_by_name(const char *name); /* @} */ @@ -244,11 +244,11 @@ int server(int argc, char *argv[]) { /** @brief Defines the value of a define to the datatype parsing infrastructure */ -void gras_datadesc_set_const(const char*name, int value); +XBT_PUBLIC void gras_datadesc_set_const(const char*name, int value); /* @} */ -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_parse(const char *name, const char *C_statement); /** @defgroup GRAS_dd_manual Simple manual data description @@ -305,43 +305,43 @@ typedef gras_datadesc_type_t (*gras_datadesc_selector_t)(gras_datadesc_type_t ty **** Declare datadescription yourself **** ******************************************/ -gras_datadesc_type_t gras_datadesc_struct(const char *name); -void gras_datadesc_struct_append(gras_datadesc_type_t struct_type, +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_struct(const char *name); +XBT_PUBLIC void gras_datadesc_struct_append(gras_datadesc_type_t struct_type, const char *name, gras_datadesc_type_t field_type); -void gras_datadesc_struct_close(gras_datadesc_type_t struct_type); +XBT_PUBLIC void gras_datadesc_struct_close(gras_datadesc_type_t struct_type); -gras_datadesc_type_t gras_datadesc_union(const char *name, +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_union(const char *name, gras_datadesc_type_cb_int_t selector); -void gras_datadesc_union_append(gras_datadesc_type_t union_type, +XBT_PUBLIC void gras_datadesc_union_append(gras_datadesc_type_t union_type, const char *name, gras_datadesc_type_t field_type); -void gras_datadesc_union_close(gras_datadesc_type_t union_type); +XBT_PUBLIC void gras_datadesc_union_close(gras_datadesc_type_t union_type); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_ref(const char *name, gras_datadesc_type_t referenced_type); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_ref_generic(const char *name, gras_datadesc_selector_t selector); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_array_fixed(const char *name, gras_datadesc_type_t element_type, long int fixed_size); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_array_dyn(const char *name, gras_datadesc_type_t element_type, gras_datadesc_type_cb_int_t dynamic_size); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t *free_func); -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_matrix(gras_datadesc_type_t elm_t, void_f_pvoid_t * const free_f); @@ -350,37 +350,37 @@ gras_datadesc_type_t *********************************/ /** \brief Specify that this type may contain cycles */ -void gras_datadesc_cycle_set(gras_datadesc_type_t type); +XBT_PUBLIC void gras_datadesc_cycle_set(gras_datadesc_type_t type); /** \brief Specify that this type do not contain any cycles (default) */ -void gras_datadesc_cycle_unset(gras_datadesc_type_t type); +XBT_PUBLIC void gras_datadesc_cycle_unset(gras_datadesc_type_t type); /** \brief Add a pre-send callback to this datadesc. */ -void gras_datadesc_cb_send (gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_send (gras_datadesc_type_t type, gras_datadesc_type_cb_void_t pre); /** \brief Add a post-receive callback to this datadesc.*/ -void gras_datadesc_cb_recv(gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_recv(gras_datadesc_type_t type, gras_datadesc_type_cb_void_t post); /** \brief Add a pre-send callback to the given field of the datadesc */ -void gras_datadesc_cb_field_send (gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_field_send (gras_datadesc_type_t type, const char *field_name, gras_datadesc_type_cb_void_t pre); /** \brief Add a post-receive callback to the given field of the datadesc */ -void gras_datadesc_cb_field_recv(gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_field_recv(gras_datadesc_type_t type, const char *field_name, gras_datadesc_type_cb_void_t post); /** \brief Add a pre-send callback to the given field resulting in its value to be pushed */ -void gras_datadesc_cb_field_push (gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_field_push (gras_datadesc_type_t type, const char *field_name); /** \brief Add a pre-send callback to the given field resulting in its value multiplied to any previously pushed value and then pushed back */ -void gras_datadesc_cb_field_push_multiplier (gras_datadesc_type_t type, +XBT_PUBLIC void gras_datadesc_cb_field_push_multiplier (gras_datadesc_type_t type, const char *field_name); /****************************** * Get stuff within datadescs * ******************************/ /** \brief Returns the name of a datadescription */ -const char * gras_datadesc_get_name(gras_datadesc_type_t ddt); +XBT_PUBLIC const char * gras_datadesc_get_name(gras_datadesc_type_t ddt); /** \brief Returns the identifier of a datadescription */ -int gras_datadesc_get_id(gras_datadesc_type_t ddt); +XBT_PUBLIC int gras_datadesc_get_id(gras_datadesc_type_t ddt); /* @} */ @@ -431,22 +431,22 @@ gras_datadesc_struct_close(my_type); */ /* @{ */ -void +XBT_PUBLIC void gras_cbps_i_push(gras_cbps_t ps, int val); -int +XBT_PUBLIC int gras_cbps_i_pop(gras_cbps_t ps); -int gras_datadesc_cb_pop(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC int gras_datadesc_cb_pop(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_int(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_uint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_lint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_ulint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_int(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_uint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_lint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_ulint(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_int_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_uint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_lint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); -void gras_datadesc_cb_push_ulint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_int_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_uint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_lint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); +XBT_PUBLIC void gras_datadesc_cb_push_ulint_mult(gras_datadesc_type_t typedesc, gras_cbps_t vars, void *data); /* @} */ @@ -465,25 +465,25 @@ void gras_datadesc_cb_push_ulint_mult(gras_datadesc_type_t typedesc, gras_cbps_t /* @{ */ -void gras_cbps_v_pop (gras_cbps_t ps, +XBT_PUBLIC void gras_cbps_v_pop (gras_cbps_t ps, const char *name, /* OUT */ gras_datadesc_type_t *ddt, /* OUT */ void **res); -void gras_cbps_v_push(gras_cbps_t ps, +XBT_PUBLIC void gras_cbps_v_push(gras_cbps_t ps, const char *name, void *data, gras_datadesc_type_t ddt); -void gras_cbps_v_set (gras_cbps_t ps, +XBT_PUBLIC void gras_cbps_v_set (gras_cbps_t ps, const char *name, void *data, gras_datadesc_type_t ddt); -void * gras_cbps_v_get (gras_cbps_t ps, +XBT_PUBLIC void * gras_cbps_v_get (gras_cbps_t ps, const char *name, /* OUT */ gras_datadesc_type_t *ddt); -void gras_cbps_block_begin(gras_cbps_t ps); -void gras_cbps_block_end(gras_cbps_t ps); +XBT_PUBLIC void gras_cbps_block_begin(gras_cbps_t ps); +XBT_PUBLIC void gras_cbps_block_end(gras_cbps_t ps); /* @} */ /* @} */ @@ -492,7 +492,7 @@ void gras_cbps_block_end(gras_cbps_t ps); /******************************* **** About data convertion **** *******************************/ -int gras_arch_selfid(void); /* ID of this arch */ +XBT_PUBLIC int gras_arch_selfid(void); /* ID of this arch */ /***************************** @@ -539,7 +539,7 @@ typedef struct DataDescriptorStruct { sizeof(structType) - offsetof(structType, lastMember) - \ sizeof(memberType) * repetitions -gras_datadesc_type_t +XBT_PUBLIC gras_datadesc_type_t gras_datadesc_import_nws(const char *name, const DataDescriptor *desc, unsigned long howmany); diff --git a/include/gras/emul.h b/include/gras/emul.h index a1835095ed..20dd401fe6 100644 --- a/include/gras/emul.h +++ b/include/gras/emul.h @@ -46,17 +46,17 @@ SG_BEGIN_DECL() */ /** \brief Returns true only if the program runs on real life */ -int gras_if_RL(void); +XBT_PUBLIC int gras_if_RL(void); /** \brief Returns true only if the program runs within the simulator */ -int gras_if_SG(void); +XBT_PUBLIC int gras_if_SG(void); /** @} */ -int gras_bench_always_begin(const char *location, int line); -int gras_bench_always_end(void); -int gras_bench_once_begin(const char *location, int line); -int gras_bench_once_end(void); +XBT_PUBLIC int gras_bench_always_begin(const char *location, int line); +XBT_PUBLIC int gras_bench_always_end(void); +XBT_PUBLIC int gras_bench_once_begin(const char *location, int line); +XBT_PUBLIC int gras_bench_once_end(void); /** @addtogroup GRAS_emul * \section GRAS_emul_timing Emulation diff --git a/include/gras/messages.h b/include/gras/messages.h index ded4199309..993fed7cc4 100644 --- a/include/gras/messages.h +++ b/include/gras/messages.h @@ -61,15 +61,15 @@ SG_BEGIN_DECL() /** \brief Opaque type */ typedef struct s_gras_msgtype *gras_msgtype_t; - void gras_msgtype_declare (const char *name, + XBT_PUBLIC void gras_msgtype_declare (const char *name, gras_datadesc_type_t payload); - void gras_msgtype_declare_v(const char *name, + XBT_PUBLIC void gras_msgtype_declare_v(const char *name, short int version, gras_datadesc_type_t payload); - gras_msgtype_t gras_msgtype_by_name (const char *name); - gras_msgtype_t gras_msgtype_by_namev(const char *name, short int version); - gras_msgtype_t gras_msgtype_by_id(int id); + XBT_PUBLIC gras_msgtype_t gras_msgtype_by_name (const char *name); + XBT_PUBLIC gras_msgtype_t gras_msgtype_by_namev(const char *name, short int version); + XBT_PUBLIC gras_msgtype_t gras_msgtype_by_id(int id); /** @} */ /** @defgroup GRAS_msg_cb Callback declaration and use @@ -91,12 +91,12 @@ typedef struct s_gras_msgtype *gras_msgtype_t; /** \brief Context of callbacks (opaque structure) */ typedef struct s_gras_msg_cb_ctx *gras_msg_cb_ctx_t; -gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx); -gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, +XBT_PUBLIC gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx); +XBT_PUBLIC gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, gras_msgtype_t msgtype, unsigned long int ID, double timeout); -void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ; +XBT_PUBLIC void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ; /** \brief Type of message callback functions. @@ -117,8 +117,8 @@ void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ; typedef int (*gras_msg_cb_t)(gras_msg_cb_ctx_t ctx, void *payload); - void gras_cb_register (gras_msgtype_t msgtype, gras_msg_cb_t cb); - void gras_cb_unregister(gras_msgtype_t msgtype, gras_msg_cb_t cb); + XBT_PUBLIC void gras_cb_register (gras_msgtype_t msgtype, gras_msg_cb_t cb); + XBT_PUBLIC void gras_cb_unregister(gras_msgtype_t msgtype, gras_msg_cb_t cb); /** @} */ @@ -129,15 +129,15 @@ void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ; /** @{ */ - void gras_msg_send(gras_socket_t sock, + XBT_PUBLIC void gras_msg_send(gras_socket_t sock, gras_msgtype_t msgtype, void *payload); - void gras_msg_wait(double timeout, + XBT_PUBLIC void gras_msg_wait(double timeout, gras_msgtype_t msgt_want, gras_socket_t *expeditor, void *payload); - void gras_msg_handleall(double period); - void gras_msg_handle(double timeOut); + XBT_PUBLIC void gras_msg_handleall(double period); + XBT_PUBLIC void gras_msg_handle(double timeOut); /** @} */ @@ -158,30 +158,30 @@ void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ; /** @{ */ /* declaration */ -void gras_msgtype_declare_rpc(const char *name, +XBT_PUBLIC void gras_msgtype_declare_rpc(const char *name, gras_datadesc_type_t payload_request, gras_datadesc_type_t payload_answer); -void gras_msgtype_declare_rpc_v(const char *name, +XBT_PUBLIC void gras_msgtype_declare_rpc_v(const char *name, short int version, gras_datadesc_type_t payload_request, gras_datadesc_type_t payload_answer); /* client side */ -void gras_msg_rpccall(gras_socket_t server, +XBT_PUBLIC void gras_msg_rpccall(gras_socket_t server, double timeOut, gras_msgtype_t msgtype, void *request, void *answer); -gras_msg_cb_ctx_t +XBT_PUBLIC gras_msg_cb_ctx_t gras_msg_rpc_async_call(gras_socket_t server, double timeOut, gras_msgtype_t msgtype, void *request); -void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, +XBT_PUBLIC void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer); /* server side */ -void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx,void *answer); +XBT_PUBLIC void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx,void *answer); /** @} */ @@ -227,14 +227,14 @@ typedef struct { typedef int (*gras_msg_filter_t)(gras_msg_t msg,void *ctx); -void gras_msg_wait_ext(double timeout, +XBT_PUBLIC void gras_msg_wait_ext(double timeout, gras_msgtype_t msgt_want, gras_socket_t expe_want, gras_msg_filter_t filter, void *filter_ctx, gras_msg_t msg_got); -void gras_msg_wait_or(double timeout, +XBT_PUBLIC void gras_msg_wait_or(double timeout, xbt_dynar_t msgt_want, gras_msg_cb_ctx_t *ctx, int *msgt_got, diff --git a/include/gras/module.h b/include/gras/module.h index df21bc34a5..761e24554d 100644 --- a/include/gras/module.h +++ b/include/gras/module.h @@ -5,17 +5,17 @@ #include /* Function users of module should use */ -void gras_module_join(const char *name); -void gras_module_leave(const char *name); +XBT_PUBLIC void gras_module_join(const char *name); +XBT_PUBLIC void gras_module_leave(const char *name); /* Functions module implementor should use */ -void gras_module_add(const char *name, unsigned int data_size, int *ID, +XBT_PUBLIC void gras_module_add(const char *name, unsigned int data_size, int *ID, void_f_void_t *init_f, void_f_void_t *exit_f, void_f_pvoid_t *join_f, void_f_pvoid_t *leave_f) ; -void *gras_moddata_by_id(unsigned int ID); +XBT_PUBLIC void *gras_moddata_by_id(unsigned int ID); #endif /* GRAS_MODULE_H */ diff --git a/include/gras/process.h b/include/gras/process.h index c19ee65599..12410774de 100644 --- a/include/gras/process.h +++ b/include/gras/process.h @@ -22,14 +22,14 @@ SG_BEGIN_DECL() * * Perform the various intialisations needed by gras. Each process must run it */ -void gras_process_init(void); +XBT_PUBLIC void gras_process_init(void); /** * gras_process_exit: * * Frees the memory allocated by gras. Processes should run it */ -void gras_process_exit(void); +XBT_PUBLIC void gras_process_exit(void); /****************************************************************************/ /* Manipulating User Data */ @@ -53,13 +53,13 @@ void gras_process_exit(void); * \brief Get the data associated with the current process. * \ingroup GRAS_globals */ -void *gras_userdata_get(void); +XBT_PUBLIC void *gras_userdata_get(void); /** * \brief Set the data associated with the current process. * \ingroup GRAS_globals */ -void gras_userdata_set(void *ud); +XBT_PUBLIC void gras_userdata_set(void *ud); /** \brief Malloc and set the data associated with the current process. */ #define gras_userdata_new(type) (gras_userdata_set(xbt_new0(type,1)),gras_userdata_get()) diff --git a/include/gras/timer.h b/include/gras/timer.h index 7a38129ad3..8e84f3e26d 100644 --- a/include/gras/timer.h +++ b/include/gras/timer.h @@ -37,16 +37,16 @@ SG_BEGIN_DECL() * @{ */ - void gras_timer_delay(double delay, void_f_void_t action); - void gras_timer_repeat(double interval, void_f_void_t action); + XBT_PUBLIC void gras_timer_delay(double delay, void_f_void_t action); + XBT_PUBLIC void gras_timer_repeat(double interval, void_f_void_t action); - void gras_timer_cancel_delay(double interval, void_f_void_t action); - void gras_timer_cancel_repeat(double interval, void_f_void_t action); + XBT_PUBLIC void gras_timer_cancel_delay(double interval, void_f_void_t action); + XBT_PUBLIC void gras_timer_cancel_repeat(double interval, void_f_void_t action); - void gras_timer_cancel_delay_all(void); - void gras_timer_cancel_repeat_all(void); + XBT_PUBLIC void gras_timer_cancel_delay_all(void); + XBT_PUBLIC void gras_timer_cancel_repeat_all(void); - void gras_timer_cancel_all(void); + XBT_PUBLIC void gras_timer_cancel_all(void); /** @} */ diff --git a/include/gras/transport.h b/include/gras/transport.h index 02dc476f5c..57da3b9323 100644 --- a/include/gras/transport.h +++ b/include/gras/transport.h @@ -36,22 +36,22 @@ typedef struct s_gras_socket *gras_socket_t; /** \brief Simply create a client socket (to speak to a remote host) */ -gras_socket_t gras_socket_client(const char *host, unsigned short port); -gras_socket_t gras_socket_client_from_string(const char *host); +XBT_PUBLIC gras_socket_t gras_socket_client(const char *host, unsigned short port); +XBT_PUBLIC gras_socket_t gras_socket_client_from_string(const char *host); /** \brief Simply create a server socket (to ear from remote hosts speaking to you) */ -gras_socket_t gras_socket_server(unsigned short port); -void gras_socket_close(gras_socket_t sd); +XBT_PUBLIC gras_socket_t gras_socket_server(unsigned short port); +XBT_PUBLIC void gras_socket_close(gras_socket_t sd); /** \brief Create a client socket, full interface to all relevant settings */ -gras_socket_t gras_socket_client_ext(const char *host, +XBT_PUBLIC gras_socket_t gras_socket_client_ext(const char *host, unsigned short port, unsigned long int bufSize, int measurement); /** \brief Create a server socket, full interface to all relevant settings */ -gras_socket_t gras_socket_server_ext(unsigned short port, +XBT_PUBLIC gras_socket_t gras_socket_server_ext(unsigned short port, unsigned long int bufSize, int measurement); -gras_socket_t +XBT_PUBLIC gras_socket_t gras_socket_server_range(unsigned short minport, unsigned short maxport, unsigned long int buf_size, int measurement); @@ -64,13 +64,13 @@ gras_socket_server_range(unsigned short minport, unsigned short maxport, /* @{*/ /** Get the port number on which this socket is connected on my side */ -int gras_socket_my_port (gras_socket_t sock); +XBT_PUBLIC int gras_socket_my_port (gras_socket_t sock); /** Get the port number on which this socket is connected on remote side */ -int gras_socket_peer_port(gras_socket_t sock); +XBT_PUBLIC int gras_socket_peer_port(gras_socket_t sock); /** Get the host name of the remote side */ -char *gras_socket_peer_name(gras_socket_t sock); +XBT_PUBLIC char *gras_socket_peer_name(gras_socket_t sock); /** Get the process name of the remote side */ -char *gras_socket_peer_proc(gras_socket_t sock); +XBT_PUBLIC char *gras_socket_peer_proc(gras_socket_t sock); /* @}*/ /** \defgroup GRAS_sock_meas Using measurement sockets @@ -86,16 +86,16 @@ char *gras_socket_peer_proc(gras_socket_t sock); -int gras_socket_is_meas(gras_socket_t sock); -void gras_socket_meas_send(gras_socket_t peer, +XBT_PUBLIC int gras_socket_is_meas(gras_socket_t sock); +XBT_PUBLIC void gras_socket_meas_send(gras_socket_t peer, unsigned int timeout, unsigned long int expSize, unsigned long int msgSize); -void gras_socket_meas_recv(gras_socket_t peer, +XBT_PUBLIC void gras_socket_meas_recv(gras_socket_t peer, unsigned int timeout, unsigned long int expSize, unsigned long int msgSize); -gras_socket_t gras_socket_meas_accept(gras_socket_t peer); +XBT_PUBLIC gras_socket_t gras_socket_meas_accept(gras_socket_t peer); /* @}*/ @@ -111,8 +111,8 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer); */ /* @{*/ /* debuging functions */ -gras_socket_t gras_socket_client_from_file(const char*path); -gras_socket_t gras_socket_server_from_file(const char*path); +XBT_PUBLIC gras_socket_t gras_socket_client_from_file(const char*path); +XBT_PUBLIC gras_socket_t gras_socket_server_from_file(const char*path); /* @} */ diff --git a/include/gras/virtu.h b/include/gras/virtu.h index 58ea323479..b4f39ba730 100644 --- a/include/gras/virtu.h +++ b/include/gras/virtu.h @@ -25,12 +25,12 @@ SG_BEGIN_DECL() * @return number of second since the Epoch. * (00:00:00 UTC, January 1, 1970 in Real Life, and begining of simulation in SG) */ -double gras_os_time(void); +XBT_PUBLIC double gras_os_time(void); /** @brief sleeps for the given amount of time. * @param sec: number of seconds to sleep */ -void gras_os_sleep(double sec); +XBT_PUBLIC void gras_os_sleep(double sec); /** @brief get the fully-qualified name of the current host * @@ -38,18 +38,18 @@ void gras_os_sleep(double sec); * cannot be determined. Always returns the same value, so multiple calls * cause no problems. */ -const char * +XBT_PUBLIC const char * gras_os_myname(void); /** @brief returns the number on which this process is listening for incoming messages */ -int gras_os_myport(void); +XBT_PUBLIC int gras_os_myport(void); /** @brief get process identification * * Returns the process ID of the current process. (This is often used by routines that generate unique temporary file names.) */ -long int gras_os_getpid(void); +XBT_PUBLIC long int gras_os_getpid(void); /** @} */ SG_END_DECL() diff --git a/include/xbt/peer.h b/include/xbt/peer.h index 5f56799883..9feb19ec83 100644 --- a/include/xbt/peer.h +++ b/include/xbt/peer.h @@ -21,11 +21,11 @@ typedef struct { int port; } s_xbt_peer_t, *xbt_peer_t; -xbt_peer_t xbt_peer_new(const char *name, int port); -xbt_peer_t xbt_peer_from_string(const char *peerport); -xbt_peer_t xbt_peer_copy(xbt_peer_t h); -void xbt_peer_free(xbt_peer_t peer); -void xbt_peer_free_voidp(void *d); +XBT_PUBLIC xbt_peer_t xbt_peer_new(const char *name, int port); +XBT_PUBLIC xbt_peer_t xbt_peer_from_string(const char *peerport); +XBT_PUBLIC xbt_peer_t xbt_peer_copy(xbt_peer_t h); +XBT_PUBLIC void xbt_peer_free(xbt_peer_t peer); +XBT_PUBLIC void xbt_peer_free_voidp(void *d); SG_END_DECL() diff --git a/include/xbt/set.h b/include/xbt/set.h index 7d4d86eaae..43f5e543e8 100644 --- a/include/xbt/set.h +++ b/include/xbt/set.h @@ -67,8 +67,8 @@ typedef struct xbt_set_elm_ { } s_xbt_set_elm_t,*xbt_set_elm_t; /*####[ Functions ]##########################################################*/ -xbt_set_t xbt_set_new (void); -void xbt_set_free(xbt_set_t *set); +XBT_PUBLIC xbt_set_t xbt_set_new (void); +XBT_PUBLIC void xbt_set_free(xbt_set_t *set); /** @} */ /** @defgroup XBT_set_basic Sets basic usage @@ -77,17 +77,17 @@ void xbt_set_free(xbt_set_t *set); * @{ */ -void xbt_set_add (xbt_set_t set, xbt_set_elm_t elm, void_f_pvoid_t *free_func); -void xbt_set_remove (xbt_set_t set, xbt_set_elm_t elm); -void xbt_set_remove_by_name (xbt_set_t set, const char *key); -void xbt_set_remove_by_name_ext (xbt_set_t set, const char *key, int key_len); -void xbt_set_remove_by_id (xbt_set_t set, int id); +XBT_PUBLIC void xbt_set_add (xbt_set_t set, xbt_set_elm_t elm, void_f_pvoid_t *free_func); +XBT_PUBLIC void xbt_set_remove (xbt_set_t set, xbt_set_elm_t elm); +XBT_PUBLIC void xbt_set_remove_by_name (xbt_set_t set, const char *key); +XBT_PUBLIC void xbt_set_remove_by_name_ext (xbt_set_t set, const char *key, int key_len); +XBT_PUBLIC void xbt_set_remove_by_id (xbt_set_t set, int id); -xbt_set_elm_t xbt_set_get_by_name (xbt_set_t set, const char *key); -xbt_set_elm_t xbt_set_get_by_name_ext(xbt_set_t set, const char *key, int key_len); -xbt_set_elm_t xbt_set_get_by_id (xbt_set_t set, int id); +XBT_PUBLIC xbt_set_elm_t xbt_set_get_by_name (xbt_set_t set, const char *key); +XBT_PUBLIC xbt_set_elm_t xbt_set_get_by_name_ext(xbt_set_t set, const char *key, int key_len); +XBT_PUBLIC xbt_set_elm_t xbt_set_get_by_id (xbt_set_t set, int id); -unsigned long xbt_set_length (const xbt_set_t set); +XBT_PUBLIC unsigned long xbt_set_length (const xbt_set_t set); /** @} */ @@ -102,10 +102,10 @@ unsigned long xbt_set_length (const xbt_set_t set); /** @brief Cursor type */ typedef struct xbt_set_cursor_ *xbt_set_cursor_t; -void xbt_set_cursor_first (xbt_set_t set, +XBT_PUBLIC void xbt_set_cursor_first (xbt_set_t set, xbt_set_cursor_t *cursor); -void xbt_set_cursor_step (xbt_set_cursor_t cursor); -int xbt_set_cursor_get_or_free (xbt_set_cursor_t *cursor, +XBT_PUBLIC void xbt_set_cursor_step (xbt_set_cursor_t cursor); +XBT_PUBLIC int xbt_set_cursor_get_or_free (xbt_set_cursor_t *cursor, xbt_set_elm_t *elm); /** @brief Iterates over the whole set diff --git a/include/xbt/swag.h b/include/xbt/swag.h index caa54e5afa..afb77bbbfa 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -86,16 +86,16 @@ typedef struct xbt_swag { * @{ */ -xbt_swag_t xbt_swag_new(size_t offset); -void xbt_swag_free(xbt_swag_t swag); -void xbt_swag_init(xbt_swag_t swag, size_t offset); -void xbt_swag_insert(void *obj, xbt_swag_t swag); -void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag); -void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag); -void *xbt_swag_remove(void *obj, xbt_swag_t swag); -void *xbt_swag_extract(xbt_swag_t swag); -int xbt_swag_size(xbt_swag_t swag); -int xbt_swag_belongs(void *obj, xbt_swag_t swag); +XBT_PUBLIC xbt_swag_t xbt_swag_new(size_t offset); +XBT_PUBLIC void xbt_swag_free(xbt_swag_t swag); +XBT_PUBLIC void xbt_swag_init(xbt_swag_t swag, size_t offset); +XBT_PUBLIC void xbt_swag_insert(void *obj, xbt_swag_t swag); +XBT_PUBLIC void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag); +XBT_PUBLIC void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag); +XBT_PUBLIC void *xbt_swag_remove(void *obj, xbt_swag_t swag); +XBT_PUBLIC void *xbt_swag_extract(xbt_swag_t swag); +XBT_PUBLIC int xbt_swag_size(xbt_swag_t swag); +XBT_PUBLIC int xbt_swag_belongs(void *obj, xbt_swag_t swag); static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag) { diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 18f04e0f05..752ca7ea15 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -24,13 +24,13 @@ SG_BEGIN_DECL() /* FIXME: better place? */ int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3); int vasprintf (char **ptr, const char *fmt, va_list ap); -char *bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); +XBT_PUBLIC char *bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); /* They live in asserts.h, but need to be declared before this module. double declaration to cut dependency cycle */ -void xbt_abort(void) _XBT_GNUC_NORETURN; -void xbt_die(const char *msg) _XBT_GNUC_NORETURN; +XBT_PUBLIC void xbt_abort(void) _XBT_GNUC_NORETURN; +XBT_PUBLIC void xbt_die(const char *msg) _XBT_GNUC_NORETURN; /** @addtogroup XBT_syscall diff --git a/src/gras_modinter.h b/src/gras_modinter.h index e4626340fa..0fc8e328fe 100644 --- a/src/gras_modinter.h +++ b/src/gras_modinter.h @@ -11,19 +11,19 @@ #define GRAS_MODINTER_H /* modules initialization functions */ -void gras_emul_init(void); -void gras_emul_exit(void); - -void gras_msg_register(void); -void gras_msg_init(void); -void gras_msg_exit(void); -void gras_trp_register(void); -void gras_trp_init(void); -void gras_trp_exit(void); -void gras_datadesc_init(void); -void gras_datadesc_exit(void); - -void gras_procdata_init(void); -void gras_procdata_exit(void); +XBT_PUBLIC void gras_emul_init(void); +XBT_PUBLIC void XBT_PUBLIC gras_emul_exit(void); + +XBT_PUBLIC void gras_msg_register(void); +XBT_PUBLIC void gras_msg_init(void); +XBT_PUBLIC void gras_msg_exit(void); +XBT_PUBLIC void gras_trp_register(void); +XBT_PUBLIC void gras_trp_init(void); +XBT_PUBLIC void gras_trp_exit(void); +XBT_PUBLIC void gras_datadesc_init(void); +XBT_PUBLIC void gras_datadesc_exit(void); + +XBT_PUBLIC void gras_procdata_init(void); +XBT_PUBLIC void gras_procdata_exit(void); #endif /* GRAS_MODINTER_H */ diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 56266fbf80..51b1f98f43 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -44,22 +44,22 @@ typedef struct surf_resource_private { /* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */ /* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */ -double generic_maxmin_share_resources(xbt_swag_t running_actions, +XBT_PUBLIC double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset); -double generic_maxmin_share_resources2(xbt_swag_t running_actions, +XBT_PUBLIC double generic_maxmin_share_resources2(xbt_swag_t running_actions, size_t offset, lmm_system_t sys); /* Generic functions common to all ressources */ -e_surf_action_state_t surf_action_get_state(surf_action_t action); -double surf_action_get_start_time(surf_action_t action); -double surf_action_get_finish_time(surf_action_t action); -void surf_action_free(surf_action_t * action); -void surf_action_change_state(surf_action_t action, +XBT_PUBLIC e_surf_action_state_t surf_action_get_state(surf_action_t action); +XBT_PUBLIC double surf_action_get_start_time(surf_action_t action); +XBT_PUBLIC double surf_action_get_finish_time(surf_action_t action); +XBT_PUBLIC void surf_action_free(surf_action_t * action); +XBT_PUBLIC void surf_action_change_state(surf_action_t action, e_surf_action_state_t state); -void surf_action_set_data(surf_action_t action, +XBT_PUBLIC void surf_action_set_data(surf_action_t action, void *data); -FILE *surf_fopen(const char *name, const char *mode); +XBT_PUBLIC FILE *surf_fopen(const char *name, const char *mode); extern lmm_system_t maxmin_system; extern tmgr_history_t history; diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 7869357aeb..a6ac66b076 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -37,17 +37,17 @@ typedef struct xbt_dict_ { typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t; extern xbt_mallocator_t dict_elm_mallocator; -extern void* dict_elm_mallocator_new_f(void); -extern void dict_elm_mallocator_free_f(void* elem); -extern void dict_elm_mallocator_reset_f(void* elem); +XBT_PUBLIC extern void* dict_elm_mallocator_new_f(void); +XBT_PUBLIC extern void dict_elm_mallocator_free_f(void* elem); +XBT_PUBLIC extern void dict_elm_mallocator_reset_f(void* elem); /*####[ Function prototypes ]################################################*/ -xbt_dictelm_t xbt_dictelm_new(const char *key, +XBT_PUBLIC xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len, void *content, void_f_pvoid_t free_f, xbt_dictelm_t next); -void xbt_dictelm_free(xbt_dictelm_t element); -void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element); +XBT_PUBLIC void xbt_dictelm_free(xbt_dictelm_t element); +XBT_PUBLIC void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element); #endif /* _XBT_DICT_PRIVATE_H_ */ diff --git a/src/xbt/ex_interface.h b/src/xbt/ex_interface.h index e5cb172f26..f1330dfaca 100644 --- a/src/xbt/ex_interface.h +++ b/src/xbt/ex_interface.h @@ -11,7 +11,7 @@ #ifndef _XBT_EX_INTERFACE_H_ #define _XBT_EX_INTERFACE_H_ -void xbt_ex_setup_backtrace(xbt_ex_t *e); +XBT_PUBLIC void xbt_ex_setup_backtrace(xbt_ex_t *e); #endif /* _XBT_EX_INTERFACE_H_ */ diff --git a/src/xbt_modinter.h b/src/xbt_modinter.h index f54aef28e0..8acc24ff34 100644 --- a/src/xbt_modinter.h +++ b/src/xbt_modinter.h @@ -11,9 +11,9 @@ #define XBT_MODINTER_H /* Modules definitions */ -void xbt_log_init(int *argc,char **argv); -void xbt_log_exit(void); -void xbt_fifo_exit(void); -void xbt_dict_exit(void); +XBT_PUBLIC void xbt_log_init(int *argc,char **argv); +XBT_PUBLIC void xbt_log_exit(void); +XBT_PUBLIC void xbt_fifo_exit(void); +XBT_PUBLIC void xbt_dict_exit(void); #endif /* XBT_MODINTER_H */ -- 2.20.1