From 9361ad5f13f67578120a74bbbfba718292084cdb Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 6 Oct 2006 13:44:52 +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@2871 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/dynar.h | 56 ++++++++++++++++++++++----------------------- include/xbt/ex.h | 12 +++++----- include/xbt/fifo.h | 56 ++++++++++++++++++++++----------------------- include/xbt/graph.h | 46 ++++++++++++++++++------------------- 4 files changed, 85 insertions(+), 85 deletions(-) diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 1007daf5cd..b34da648b8 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -62,17 +62,17 @@ SG_BEGIN_DECL() typedef struct xbt_dynar_s *xbt_dynar_t; - xbt_dynar_t xbt_dynar_new(unsigned long elm_size, + XBT_PUBLIC xbt_dynar_t xbt_dynar_new(unsigned long elm_size, void_f_pvoid_t *free_func); - void xbt_dynar_free(xbt_dynar_t *dynar); - void xbt_dynar_free_voidp(void *dynar); - void xbt_dynar_free_container(xbt_dynar_t *dynar); + XBT_PUBLIC void xbt_dynar_free(xbt_dynar_t *dynar); + XBT_PUBLIC void xbt_dynar_free_voidp(void *dynar); + XBT_PUBLIC void xbt_dynar_free_container(xbt_dynar_t *dynar); - unsigned long xbt_dynar_length(const xbt_dynar_t dynar); - void xbt_dynar_reset(xbt_dynar_t dynar); - void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots); + XBT_PUBLIC unsigned long xbt_dynar_length(const xbt_dynar_t dynar); + XBT_PUBLIC void xbt_dynar_reset(xbt_dynar_t dynar); + XBT_PUBLIC void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots); - void xbt_dynar_dump(xbt_dynar_t dynar); + XBT_PUBLIC void xbt_dynar_dump(xbt_dynar_t dynar); /** @} */ /** @defgroup XBT_dynar_array Dynar as a regular array @@ -81,16 +81,16 @@ SG_BEGIN_DECL() * @{ */ - void xbt_dynar_get_cpy(const xbt_dynar_t dynar, int idx, void * const dst); + XBT_PUBLIC void xbt_dynar_get_cpy(const xbt_dynar_t dynar, int idx, void * const dst); - void xbt_dynar_set(xbt_dynar_t dynar, int idx, const void *src); - void xbt_dynar_replace(xbt_dynar_t dynar, int idx, const void *object); + XBT_PUBLIC void xbt_dynar_set(xbt_dynar_t dynar, int idx, const void *src); + XBT_PUBLIC void xbt_dynar_replace(xbt_dynar_t dynar, int idx, const void *object); - void xbt_dynar_insert_at(xbt_dynar_t dynar, int idx, const void *src); - void xbt_dynar_remove_at(xbt_dynar_t dynar, int idx, void * const dst); + XBT_PUBLIC void xbt_dynar_insert_at(xbt_dynar_t dynar, int idx, const void *src); + XBT_PUBLIC void xbt_dynar_remove_at(xbt_dynar_t dynar, int idx, void * const dst); - int xbt_dynar_search(xbt_dynar_t dynar, void *elem); - int xbt_dynar_member(xbt_dynar_t dynar, void *elem); + XBT_PUBLIC int xbt_dynar_search(xbt_dynar_t dynar, void *elem); + XBT_PUBLIC int xbt_dynar_member(xbt_dynar_t dynar, void *elem); /** @} */ /** @defgroup XBT_dynar_perl Perl-like use of dynars * @ingroup XBT_dynar @@ -98,11 +98,11 @@ SG_BEGIN_DECL() * @{ */ - void xbt_dynar_push (xbt_dynar_t dynar, const void *src); - void xbt_dynar_pop (xbt_dynar_t dynar, void *const dst); - void xbt_dynar_unshift (xbt_dynar_t dynar, const void *src); - void xbt_dynar_shift (xbt_dynar_t dynar, void *const dst); - void xbt_dynar_map (const xbt_dynar_t dynar, void_f_pvoid_t *op); + XBT_PUBLIC void xbt_dynar_push (xbt_dynar_t dynar, const void *src); + XBT_PUBLIC void xbt_dynar_pop (xbt_dynar_t dynar, void *const dst); + XBT_PUBLIC void xbt_dynar_unshift (xbt_dynar_t dynar, const void *src); + XBT_PUBLIC void xbt_dynar_shift (xbt_dynar_t dynar, void *const dst); + XBT_PUBLIC void xbt_dynar_map (const xbt_dynar_t dynar, void_f_pvoid_t *op); /** @} */ /** @defgroup XBT_dynar_ctn Direct manipulation to the dynars content @@ -113,10 +113,10 @@ SG_BEGIN_DECL() * @{ */ - void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const int idx); - void *xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx); - void *xbt_dynar_push_ptr(xbt_dynar_t dynar); - void *xbt_dynar_pop_ptr(xbt_dynar_t dynar); + XBT_PUBLIC void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const int idx); + XBT_PUBLIC void *xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx); + XBT_PUBLIC void *xbt_dynar_push_ptr(xbt_dynar_t dynar); + XBT_PUBLIC void *xbt_dynar_pop_ptr(xbt_dynar_t dynar); /** @} */ /** @defgroup XBT_dynar_speed Speed optimized access to dynars of scalars @@ -165,11 +165,11 @@ SG_BEGIN_DECL() * @{ */ - void xbt_dynar_cursor_first (const xbt_dynar_t dynar, int *cursor); - void xbt_dynar_cursor_step (const xbt_dynar_t dynar, int *cursor); - int xbt_dynar_cursor_get (const xbt_dynar_t dynar, int *cursor, + XBT_PUBLIC void xbt_dynar_cursor_first (const xbt_dynar_t dynar, int *cursor); + XBT_PUBLIC void xbt_dynar_cursor_step (const xbt_dynar_t dynar, int *cursor); + XBT_PUBLIC int xbt_dynar_cursor_get (const xbt_dynar_t dynar, int *cursor, void *whereto); - void xbt_dynar_cursor_rm(xbt_dynar_t dynar, + XBT_PUBLIC void xbt_dynar_cursor_rm(xbt_dynar_t dynar, int *const cursor); diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 5f2fd59faf..46bfdf86fe 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -30,7 +30,7 @@ extern int backtrace (void **__array, int __size); #undef __EX_MAYDAY #ifdef __EX_MAYDAY -int gras_os_getpid(void); +XBT_PUBLIC int gras_os_getpid(void); # define MAYDAY_SAVE(m) printf("%d %s:%d save %p\n", \ gras_os_getpid(),__FILE__,__LINE__, \ (m)->jb \ @@ -230,7 +230,7 @@ typedef struct { __ex_mctx_struct } __ex_mctx_t; */ /* we need this symbol here, even if it breaks a bit the module separation */ -long int gras_os_getpid(void); +XBT_PUBLIC long int gras_os_getpid(void); /** @brief different kind of errors */ typedef enum { @@ -245,7 +245,7 @@ typedef enum { thread_error /**< error while [un]locking */ } xbt_errcat_t; -const char * xbt_ex_catname(xbt_errcat_t cat); +XBT_PUBLIC const char * xbt_ex_catname(xbt_errcat_t cat); /** @brief Structure describing an exception */ typedef struct { @@ -505,10 +505,10 @@ extern void __xbt_ex_terminate_default(xbt_ex_t *e); #define RETHROW5(msg,a,b,c,d,e) _XBT_PRE_RETHROW msg,a,b,c,d,e, _XBT_POST_RETHROW /** @brief Exception destructor */ -void xbt_ex_free(xbt_ex_t e); +XBT_PUBLIC void xbt_ex_free(xbt_ex_t e); -void xbt_ex_display(xbt_ex_t *e); -void xbt_backtrace_display(void); +XBT_PUBLIC void xbt_ex_display(xbt_ex_t *e); +XBT_PUBLIC void xbt_backtrace_display(void); /** @} */ #endif /* __XBT_EX_H__ */ diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 1da1eb44b8..6d8feed3a8 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -32,8 +32,8 @@ typedef struct xbt_fifo_item *xbt_fifo_item_t; */ typedef struct xbt_fifo *xbt_fifo_t; -xbt_fifo_t xbt_fifo_new(void); -void xbt_fifo_free(xbt_fifo_t); +XBT_PUBLIC xbt_fifo_t xbt_fifo_new(void); +XBT_PUBLIC void xbt_fifo_free(xbt_fifo_t); /** @} */ /** @defgroup XBT_fifo_perl Fifo perl-like functions @@ -41,12 +41,12 @@ void xbt_fifo_free(xbt_fifo_t); * * @{ */ -xbt_fifo_item_t xbt_fifo_push(xbt_fifo_t, void *); -void *xbt_fifo_pop(xbt_fifo_t); -xbt_fifo_item_t xbt_fifo_unshift(xbt_fifo_t, void *); -void *xbt_fifo_shift(xbt_fifo_t); -int xbt_fifo_size(xbt_fifo_t); -int xbt_fifo_is_in(xbt_fifo_t, void *); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_push(xbt_fifo_t, void *); +XBT_PUBLIC void *xbt_fifo_pop(xbt_fifo_t); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_unshift(xbt_fifo_t, void *); +XBT_PUBLIC void *xbt_fifo_shift(xbt_fifo_t); +XBT_PUBLIC int xbt_fifo_size(xbt_fifo_t); +XBT_PUBLIC int xbt_fifo_is_in(xbt_fifo_t, void *); /** @} */ /** @defgroup XBT_fifo_direct Direct access to fifo elements @@ -55,22 +55,22 @@ int xbt_fifo_is_in(xbt_fifo_t, void *); * @{ */ -xbt_fifo_item_t xbt_fifo_new_item(void); -void xbt_fifo_set_item_content(xbt_fifo_item_t, void *); -void *xbt_fifo_get_item_content(xbt_fifo_item_t); -void xbt_fifo_free_item(xbt_fifo_item_t); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_new_item(void); +XBT_PUBLIC void xbt_fifo_set_item_content(xbt_fifo_item_t, void *); +XBT_PUBLIC void *xbt_fifo_get_item_content(xbt_fifo_item_t); +XBT_PUBLIC void xbt_fifo_free_item(xbt_fifo_item_t); -void xbt_fifo_push_item(xbt_fifo_t, xbt_fifo_item_t); -xbt_fifo_item_t xbt_fifo_pop_item(xbt_fifo_t); -void xbt_fifo_unshift_item(xbt_fifo_t, xbt_fifo_item_t); -xbt_fifo_item_t xbt_fifo_shift_item(xbt_fifo_t); +XBT_PUBLIC void xbt_fifo_push_item(xbt_fifo_t, xbt_fifo_item_t); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_pop_item(xbt_fifo_t); +XBT_PUBLIC void xbt_fifo_unshift_item(xbt_fifo_t, xbt_fifo_item_t); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_shift_item(xbt_fifo_t); -void xbt_fifo_remove(xbt_fifo_t, void *); -void xbt_fifo_remove_item(xbt_fifo_t, xbt_fifo_item_t); +XBT_PUBLIC void xbt_fifo_remove(xbt_fifo_t, void *); +XBT_PUBLIC void xbt_fifo_remove_item(xbt_fifo_t, xbt_fifo_item_t); -xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l); -xbt_fifo_item_t xbt_fifo_get_next_item(xbt_fifo_item_t i); -xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_get_next_item(xbt_fifo_item_t i); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i); /** * \brief List iterator @@ -95,17 +95,17 @@ xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i); * * @{ */ -void **xbt_fifo_to_array(xbt_fifo_t); -xbt_fifo_t xbt_fifo_copy(xbt_fifo_t); +XBT_PUBLIC void **xbt_fifo_to_array(xbt_fifo_t); +XBT_PUBLIC xbt_fifo_t xbt_fifo_copy(xbt_fifo_t); /** @} */ /* Deprecated functions: don't use! */ -xbt_fifo_item_t xbt_fifo_newitem(void); -void xbt_fifo_freeitem(xbt_fifo_item_t); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_newitem(void); +XBT_PUBLIC void xbt_fifo_freeitem(xbt_fifo_item_t); -xbt_fifo_item_t xbt_fifo_getFirstItem(xbt_fifo_t l); -xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i); -xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t i); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_getFirstItem(xbt_fifo_t l); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i); +XBT_PUBLIC xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t i); SG_END_DECL() diff --git a/include/xbt/graph.h b/include/xbt/graph.h index 658402c9df..8a68dac46b 100644 --- a/include/xbt/graph.h +++ b/include/xbt/graph.h @@ -23,45 +23,45 @@ typedef struct xbt_edge *xbt_edge_t; typedef struct xbt_graph *xbt_graph_t; /* API */ -xbt_graph_t xbt_graph_new_graph(unsigned short int directed, void *data); -xbt_node_t xbt_graph_new_node(xbt_graph_t g, void *data); -xbt_edge_t xbt_graph_new_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst, +XBT_PUBLIC xbt_graph_t xbt_graph_new_graph(unsigned short int directed, void *data); +XBT_PUBLIC xbt_node_t xbt_graph_new_node(xbt_graph_t g, void *data); +XBT_PUBLIC xbt_edge_t xbt_graph_new_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst, void *data); -void *xbt_graph_node_get_data(xbt_node_t node); -void xbt_graph_node_set_data(xbt_node_t node, void *data); -void *xbt_graph_edge_get_data(xbt_edge_t edge); -void xbt_graph_edge_set_data(xbt_edge_t edge, void *data); +XBT_PUBLIC void *xbt_graph_node_get_data(xbt_node_t node); +XBT_PUBLIC void xbt_graph_node_set_data(xbt_node_t node, void *data); +XBT_PUBLIC void *xbt_graph_edge_get_data(xbt_edge_t edge); +XBT_PUBLIC void xbt_graph_edge_set_data(xbt_edge_t edge, void *data); -xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst); +XBT_PUBLIC xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst); -void xbt_graph_edge_set_length(xbt_edge_t e, double length); -double xbt_graph_edge_get_length(xbt_edge_t e); -double* xbt_graph_get_length_matrix(xbt_graph_t g); +XBT_PUBLIC void xbt_graph_edge_set_length(xbt_edge_t e, double length); +XBT_PUBLIC double xbt_graph_edge_get_length(xbt_edge_t e); +XBT_PUBLIC double* xbt_graph_get_length_matrix(xbt_graph_t g); -void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, +XBT_PUBLIC void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, void_f_pvoid_t *node_free_function , void_f_pvoid_t *edge_free_function); -void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, +XBT_PUBLIC void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, void_f_pvoid_t *free_function); -void xbt_graph_free_graph(xbt_graph_t g, +XBT_PUBLIC void xbt_graph_free_graph(xbt_graph_t g, void_f_pvoid_t *node_free_function, void_f_pvoid_t *edge_free_function, void_f_pvoid_t *graph_free_function); -int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p); +XBT_PUBLIC int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p); -xbt_dynar_t xbt_graph_get_nodes(xbt_graph_t g); -xbt_dynar_t xbt_graph_get_edges(xbt_graph_t g); -xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e); -xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e); -xbt_graph_t xbt_graph_read(const char *filename, +XBT_PUBLIC xbt_dynar_t xbt_graph_get_nodes(xbt_graph_t g); +XBT_PUBLIC xbt_dynar_t xbt_graph_get_edges(xbt_graph_t g); +XBT_PUBLIC xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e); +XBT_PUBLIC xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e); +XBT_PUBLIC xbt_graph_t xbt_graph_read(const char *filename, void *(node_label_and_data)(xbt_node_t, const char*, const char*), void *(edge_label_and_data)(xbt_edge_t, const char*, const char*) ); -void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename, +XBT_PUBLIC void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename, const char *(node_name)(xbt_node_t), const char *(edge_name)(xbt_edge_t)); -void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, +XBT_PUBLIC void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, const char *(node_name)(xbt_node_t), const char *(edge_name)(xbt_edge_t), const char *(node_data_print)(void *), @@ -69,7 +69,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, /* Not implemented yet ! */ /* void *xbt_graph_to_array(xbt_graph_t g); */ -xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g); +XBT_PUBLIC xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g); -- 2.20.1