From 9a91aebb1aab0ee184237adc8a2307a015941b9c Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 11 Dec 2009 12:13:56 +0000 Subject: [PATCH] Do not mark all public function as potentially inline since it breaks on mac (get inlined in any case). Mark inline functions explicitelly git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6883 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/dict.h | 4 ++-- include/xbt/fifo.h | 6 +++--- include/xbt/misc.h | 4 ++-- include/xbt/swag.h | 2 +- src/include/simix/simix.h | 6 +++--- src/include/surf/trace_mgr.h | 2 +- src/xbt/xbt_str.c | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/xbt/dict.h b/include/xbt/dict.h index d941c59b30..41e613d8d3 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -117,7 +117,7 @@ XBT_PUBLIC(void) xbt_dict_remove_ext(xbt_dict_t dict, const char *key, XBT_PUBLIC(xbt_dict_cursor_t) xbt_dict_cursor_new(const xbt_dict_t dict); XBT_PUBLIC(void) xbt_dict_cursor_free(xbt_dict_cursor_t * cursor); -XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor); +XBT_INLINE XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor); XBT_PUBLIC(char *) xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor); @@ -125,7 +125,7 @@ XBT_PUBLIC(void *) xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor); XBT_PUBLIC(void) xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor); -XBT_PUBLIC(void) xbt_dict_cursor_step(xbt_dict_cursor_t cursor); +XBT_INLINE XBT_PUBLIC(void) xbt_dict_cursor_step(xbt_dict_cursor_t cursor); XBT_PUBLIC(int) xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data); /** @def xbt_dict_foreach diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 5f8bac98a7..143370b179 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -53,10 +53,10 @@ XBT_PUBLIC(int) xbt_fifo_is_in(xbt_fifo_t, void *); * @{ */ -XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); +XBT_INLINE 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); +XBT_INLINE XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_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); @@ -67,7 +67,7 @@ XBT_PUBLIC(int) xbt_fifo_remove(xbt_fifo_t, void *); XBT_PUBLIC(int) xbt_fifo_remove_all(xbt_fifo_t, void *); XBT_PUBLIC(void) xbt_fifo_remove_item(xbt_fifo_t, xbt_fifo_item_t); -XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_first_item(xbt_fifo_t l); +XBT_INLINE 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); diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 46857a782d..e1c700d6d1 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -144,9 +144,9 @@ # define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type # define XBT_PUBLIC_DATA(type) __declspec(dllimport) type -/* UNIX build. Mark all functions as [potentially] inline, in case we are compiling in supernovae */ +/* UNIX build */ #else -# define XBT_PUBLIC(type) XBT_INLINE type +# define XBT_PUBLIC(type) extern type # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) type # define XBT_PUBLIC_DATA(type) extern type diff --git a/include/xbt/swag.h b/include/xbt/swag.h index af8d65f39e..82f723fd6a 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -89,7 +89,7 @@ typedef struct foo { 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_INLINE 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); diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h index 82785d0b17..e316262114 100644 --- a/src/include/simix/simix.h +++ b/src/include/simix/simix.h @@ -106,7 +106,7 @@ XBT_PUBLIC(void) SIMIX_process_set_data(smx_process_t process, void *data); XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process); XBT_PUBLIC(const char *) SIMIX_process_get_name(smx_process_t process); -XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); +XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); XBT_PUBLIC(void) SIMIX_process_yield(void); XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process); @@ -205,7 +205,7 @@ XBT_PUBLIC(void) SIMIX_rdv_set_data(smx_rdv_t rdv,void *data); XBT_PUBLIC(void*) SIMIX_rdv_get_data(smx_rdv_t rdv); /*****Communication Requests*****/ -XBT_PUBLIC(void) SIMIX_communication_cancel(smx_comm_t comm); +XBT_INLINE XBT_PUBLIC(void) SIMIX_communication_cancel(smx_comm_t comm); XBT_PUBLIC(double) SIMIX_communication_get_remains(smx_comm_t comm); XBT_PUBLIC(void *) SIMIX_communication_get_data(smx_comm_t comm); @@ -219,7 +219,7 @@ XBT_PUBLIC(smx_comm_t) SIMIX_network_isend(smx_rdv_t rdv, double task_size, doub void *src_buff, size_t src_buff_size, void *data); XBT_PUBLIC(smx_comm_t) SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size); XBT_PUBLIC(unsigned int) SIMIX_network_waitany(xbt_dynar_t comms); -XBT_PUBLIC(void) SIMIX_network_wait(smx_comm_t comm, double timeout); +XBT_INLINE XBT_PUBLIC(void) SIMIX_network_wait(smx_comm_t comm, double timeout); XBT_PUBLIC(int) SIMIX_network_test(smx_comm_t comm); SG_END_DECL() diff --git a/src/include/surf/trace_mgr.h b/src/include/surf/trace_mgr.h index d5952f80d0..64a7a89da6 100644 --- a/src/include/surf/trace_mgr.h +++ b/src/include/surf/trace_mgr.h @@ -22,7 +22,7 @@ XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, const char *input, double periodicity); XBT_PUBLIC(tmgr_trace_t) tmgr_empty_trace_new(void); -XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace); +XBT_INLINE XBT_PUBLIC(void) tmgr_trace_free(tmgr_trace_t trace); /** * \brief Free a trace event structure * diff --git a/src/xbt/xbt_str.c b/src/xbt/xbt_str.c index 9646fbcfa4..a1a6da17c5 100644 --- a/src/xbt/xbt_str.c +++ b/src/xbt/xbt_str.c @@ -229,7 +229,7 @@ char *xbt_str_varsubst(char *str, xbt_dict_t patterns) xbt_dynar_t xbt_str_split(const char *s, const char *sep) { - xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref); + xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref); const char *p, *q; int done; const char *sep_dflt = " \t\n\r\x0B"; @@ -278,7 +278,7 @@ xbt_dynar_t xbt_str_split(const char *s, const char *sep) */ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep) { - xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref); + xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref); int done; const char *p, *q; @@ -330,7 +330,7 @@ xbt_dynar_t xbt_str_split_str(const char *s, const char *sep) xbt_dynar_t xbt_str_split_quoted(const char *s) { - xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref); + xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref); char *str_to_free; /* we have to copy the string before, to handle backslashes */ char *beg, *end; /* pointers around the parsed chunk */ int in_simple_quote = 0, in_double_quote = 0; @@ -669,7 +669,7 @@ char *xbt_str_diff(char *a, char *b) xbt_dynar_t db = xbt_str_split(b, "\n"); xbt_matrix_t C = diff_build_LCS(da, db); - xbt_dynar_t diff = xbt_dynar_new(sizeof(char *), xbt_free_ref); + xbt_dynar_t diff = xbt_dynar_new(sizeof(char *), &xbt_free_ref); char *res = NULL; diff_build_diff(diff, C, da, db, xbt_dynar_length(da) - 1, -- 2.20.1