diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | UPGRADE.txt | 4 | ||||
| -rwxr-xr-x | build_tools/make_buildopts_h | 1 | ||||
| -rw-r--r-- | include/asterisk.h | 10 | ||||
| -rw-r--r-- | include/asterisk/inline_api.h | 6 | ||||
| -rw-r--r-- | include/asterisk/lock.h | 32 | ||||
| -rw-r--r-- | include/asterisk/utils.h | 11 | ||||
| -rw-r--r-- | main/asterisk.c | 26 | ||||
| -rw-r--r-- | main/utils.c | 43 | ||||
| -rw-r--r-- | utils/ael_main.c | 6 | ||||
| -rw-r--r-- | utils/astman.c | 2 | ||||
| -rw-r--r-- | utils/check_expr.c | 4 | ||||
| -rw-r--r-- | utils/conf2ael.c | 4 |
13 files changed, 85 insertions, 71 deletions
@@ -12,6 +12,13 @@ --- Functionality changes from Asterisk 14 to Asterisk 15 -------------------- ------------------------------------------------------------------------------ +Build System +------------------ + * LOW_MEMORY no longer has an effect on Asterisk ABI. Symbols that were + previously suppressed by LOW_MEMORY are now replaced by stub functions. + Asterisk built with LOW_MEMORY can now successfully load binary modules + built without LOW_MEMORY and vice versa. + chan_sip ------------------ * If an offer is received with optional SRTP (a media stream with RTP/AVP but diff --git a/UPGRADE.txt b/UPGRADE.txt index ad03edf84..7acc7a80a 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -22,3 +22,7 @@ === UPGRADE-13.txt -- Upgrade info for 12 to 13 === UPGRADE-14.txt -- Upgrade info for 13 to 14 =========================================================== + +Build System: + - The LOW_MEMORY compile option no longer disables inline API. To disable + inline API you must use the DISABLE_INLINE option. diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index c96e50876..900e984e2 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -24,6 +24,7 @@ for x in ${TMP}; do -o "${x}" = "BETTER_BACKTRACES" \ -o "${x}" = "LOTS_OF_SPANS" \ -o "${x}" = "BUILD_NATIVE" \ + -o "${x}" = "LOW_MEMORY" \ -o "${x}" = "REF_DEBUG" \ -o "${x}" = "AO2_DEBUG" \ -o "${x}" = "REBUILD_PARSERS" \ diff --git a/include/asterisk.h b/include/asterisk.h index 93c7cfb28..f5ed09167 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -152,7 +152,6 @@ int ast_shutting_down(void); */ int ast_shutdown_final(void); -#if !defined(LOW_MEMORY) /*! * \brief Register the version of a source code file with the core. * \param file the source file name @@ -225,11 +224,7 @@ char *ast_complete_source_filename(const char *partial, int n); __ast_unregister_file(__FILE__); \ } #endif /* !MTX_PROFILE */ -#else /* LOW_MEMORY */ -#define ASTERISK_REGISTER_FILE() -#endif /* LOW_MEMORY */ -#if !defined(LOW_MEMORY) /*! * \brief support for event profiling * @@ -248,11 +243,6 @@ char *ast_complete_source_filename(const char *partial, int n); int ast_add_profile(const char *, uint64_t scale); int64_t ast_profile(int, int64_t); int64_t ast_mark(int, int start1_stop0); -#else /* LOW_MEMORY */ -#define ast_add_profile(a, b) 0 -#define ast_profile(a, b) do { } while (0) -#define ast_mark(a, b) do { } while (0) -#endif /* LOW_MEMORY */ /*! \brief * Definition of various structures that many asterisk files need, diff --git a/include/asterisk/inline_api.h b/include/asterisk/inline_api.h index 291a83828..5f7a43bdc 100644 --- a/include/asterisk/inline_api.h +++ b/include/asterisk/inline_api.h @@ -33,7 +33,7 @@ copies of the function body are not built in different modules. However, since this doesn't work for clang, we go with 'static' anyway and hope for the best! - - when LOW_MEMORY is defined, inlining should be disabled + - when DISABLE_INLINE is defined, inlining should be disabled completely, even if the compiler is configured to support it The AST_INLINE_API macro allows this to happen automatically, when @@ -45,7 +45,7 @@ including the header file */ -#if !defined(LOW_MEMORY) && !defined(DISABLE_INLINE) +#if !defined(DISABLE_INLINE) #if !defined(AST_API_MODULE) #if defined(__clang__) || defined(__GNUC_STDC_INLINE__) @@ -57,7 +57,7 @@ #define AST_INLINE_API(hdr, body) hdr; hdr body #endif -#else /* defined(LOW_MEMORY) */ +#else /* defined(DISABLE_INLINE) */ #if !defined(AST_API_MODULE) #define AST_INLINE_API(hdr, body) hdr; diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 652ca136e..5b6817f6b 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -240,7 +240,6 @@ enum ast_lock_type { * lock info struct. The lock is marked as pending as the thread is waiting * on the lock. ast_mark_lock_acquired() will mark it as held by this thread. */ -#if !defined(LOW_MEMORY) #ifdef HAVE_BKTR void ast_store_lock_info(enum ast_lock_type type, const char *filename, int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt); @@ -249,32 +248,15 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, int line_num, const char *func, const char *lock_name, void *lock_addr); #endif /* HAVE_BKTR */ -#else - -#ifdef HAVE_BKTR -#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS,BUD) -#else -#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS) -#endif /* HAVE_BKTR */ -#endif /* !defined(LOW_MEMORY) */ - /*! * \brief Mark the last lock as acquired */ -#if !defined(LOW_MEMORY) void ast_mark_lock_acquired(void *lock_addr); -#else -#define ast_mark_lock_acquired(ignore) -#endif /*! * \brief Mark the last lock as failed (trylock) */ -#if !defined(LOW_MEMORY) void ast_mark_lock_failed(void *lock_addr); -#else -#define ast_mark_lock_failed(ignore) -#endif /*! * \brief remove lock info for the current thread @@ -282,7 +264,6 @@ void ast_mark_lock_failed(void *lock_addr); * this gets called by ast_mutex_unlock so that information on the lock can * be removed from the current thread's lock info struct. */ -#if !defined(LOW_MEMORY) #ifdef HAVE_BKTR void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt); #else @@ -290,15 +271,6 @@ void ast_remove_lock_info(void *lock_addr); #endif /* HAVE_BKTR */ void ast_suspend_lock_info(void *lock_addr); void ast_restore_lock_info(void *lock_addr); -#else -#ifdef HAVE_BKTR -#define ast_remove_lock_info(ignore,me) -#else -#define ast_remove_lock_info(ignore) -#endif /* HAVE_BKTR */ -#define ast_suspend_lock_info(ignore); -#define ast_restore_lock_info(ignore); -#endif /* !defined(LOW_MEMORY) */ /*! * \brief log info for the current lock with ast_log(). @@ -333,11 +305,7 @@ struct ast_str *ast_dump_locks(void); * this gets called during deadlock avoidance, so that the information may * be preserved as to what location originally acquired the lock. */ -#if !defined(LOW_MEMORY) int ast_find_lock_info(void *lock_addr, char *filename, size_t filename_size, int *lineno, char *func, size_t func_size, char *mutex_name, size_t mutex_name_size); -#else -#define ast_find_lock_info(a,b,c,d,e,f,g,h) -1 -#endif /*! * \brief Unlock a lock briefly diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 9789d34ee..f9608f517 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -423,13 +423,12 @@ int ast_careful_fwrite(FILE *f, int fd, const char *s, size_t len, int timeoutms * Thread management support (should be moved to lock.h or a different header) */ -#define AST_STACKSIZE (((sizeof(void *) * 8 * 8) - 16) * 1024) +#define AST_STACKSIZE (((sizeof(void *) * 8 * 8) - 16) * 1024) +#define AST_STACKSIZE_LOW (((sizeof(void *) * 8 * 2) - 16) * 1024) -#if defined(LOW_MEMORY) -#define AST_BACKGROUND_STACKSIZE (((sizeof(void *) * 8 * 2) - 16) * 1024) -#else -#define AST_BACKGROUND_STACKSIZE AST_STACKSIZE -#endif +int ast_background_stacksize(void); + +#define AST_BACKGROUND_STACKSIZE ast_background_stacksize() void ast_register_thread(char *name); void ast_unregister_thread(void *id); diff --git a/main/asterisk.c b/main/asterisk.c index 94481eecf..7fc0912c4 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -494,9 +494,11 @@ struct registered_file { }; static AST_RWLIST_HEAD_STATIC(registered_files, registered_file); +#endif /* ! LOW_MEMORY */ void __ast_register_file(const char *file) { +#if !defined(LOW_MEMORY) struct registered_file *reg; reg = ast_calloc(1, sizeof(*reg)); @@ -508,10 +510,12 @@ void __ast_register_file(const char *file) AST_RWLIST_WRLOCK(®istered_files); AST_RWLIST_INSERT_HEAD(®istered_files, reg, list); AST_RWLIST_UNLOCK(®istered_files); +#endif /* ! LOW_MEMORY */ } void __ast_unregister_file(const char *file) { +#if !defined(LOW_MEMORY) struct registered_file *find; AST_RWLIST_WRLOCK(®istered_files); @@ -527,10 +531,12 @@ void __ast_unregister_file(const char *file) if (find) { ast_free(find); } +#endif /* ! LOW_MEMORY */ } char *ast_complete_source_filename(const char *partial, int n) { +#if !defined(LOW_MEMORY) struct registered_file *find; size_t len = strlen(partial); int count = 0; @@ -545,8 +551,12 @@ char *ast_complete_source_filename(const char *partial, int n) } AST_RWLIST_UNLOCK(®istered_files); return res; +#else /* if defined(LOW_MEMORY) */ + return NULL; +#endif } +#if !defined(LOW_MEMORY) struct thread_list_t { AST_RWLIST_ENTRY(thread_list_t) list; char *name; @@ -872,12 +882,14 @@ struct profile_data { }; static struct profile_data *prof_data; +#endif /* ! LOW_MEMORY */ /*! \brief allocates a counter with a given name and scale. * \return Returns the identifier of the counter. */ int ast_add_profile(const char *name, uint64_t scale) { +#if !defined(LOW_MEMORY) int l = sizeof(struct profile_data); int n = 10; /* default entries */ @@ -904,10 +916,14 @@ int ast_add_profile(const char *name, uint64_t scale) prof_data->e[n].mark = 0; prof_data->e[n].scale = scale; return n; +#else /* if defined(LOW_MEMORY) */ + return 0; +#endif } int64_t ast_profile(int i, int64_t delta) { +#if !defined(LOW_MEMORY) if (!prof_data || i < 0 || i > prof_data->entries) /* invalid index */ return 0; if (prof_data->e[i].scale > 1) @@ -915,8 +931,12 @@ int64_t ast_profile(int i, int64_t delta) prof_data->e[i].value += delta; prof_data->e[i].events++; return prof_data->e[i].value; +#else /* if defined(LOW_MEMORY) */ + return 0; +#endif } +#if !defined(LOW_MEMORY) /* The RDTSC instruction was introduced on the Pentium processor and is not * implemented on certain clones, like the Cyrix 586. Hence, the previous * expectation of __i386__ was in error. */ @@ -940,9 +960,11 @@ rdtsc(void) return 0; } #endif +#endif /* ! LOW_MEMORY */ int64_t ast_mark(int i, int startstop) { +#if !defined(LOW_MEMORY) if (!prof_data || i < 0 || i > prof_data->entries) /* invalid index */ return 0; if (startstop == 1) @@ -955,8 +977,12 @@ int64_t ast_mark(int i, int startstop) prof_data->e[i].events++; } return prof_data->e[i].mark; +#else /* if defined(LOW_MEMORY) */ + return 0; +#endif } +#if !defined(LOW_MEMORY) #define DEFINE_PROFILE_MIN_MAX_VALUES min = 0; \ max = prof_data->entries;\ if (a->argc > 3) { /* specific entries */ \ diff --git a/main/utils.c b/main/utils.c index 73b1c8703..c8ede91d9 100644 --- a/main/utils.c +++ b/main/utils.c @@ -614,10 +614,9 @@ static int dev_urandom_fd = -1; #undef pthread_create /* For ast_pthread_create function only */ #endif /* !__linux__ */ -#if !defined(LOW_MEMORY) - #ifdef DEBUG_THREADS +#if !defined(LOW_MEMORY) /*! \brief A reasonable maximum number of locks a thread would be holding ... */ #define AST_MAX_LOCKS 64 @@ -720,6 +719,8 @@ static void lock_info_destroy(void *data) * \brief The thread storage key for per-thread lock info */ AST_THREADSTORAGE_CUSTOM(thread_lock_info, NULL, lock_info_destroy); +#endif /* ! LOW_MEMORY */ + #ifdef HAVE_BKTR void ast_store_lock_info(enum ast_lock_type type, const char *filename, int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt) @@ -728,6 +729,7 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, int line_num, const char *func, const char *lock_name, void *lock_addr) #endif { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; int i; @@ -778,10 +780,12 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, lock_info->num_locks++; pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } void ast_mark_lock_acquired(void *lock_addr) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; if (!(lock_info = ast_threadstorage_get(&thread_lock_info, sizeof(*lock_info)))) @@ -792,10 +796,12 @@ void ast_mark_lock_acquired(void *lock_addr) lock_info->locks[lock_info->num_locks - 1].pending = 0; } pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } void ast_mark_lock_failed(void *lock_addr) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; if (!(lock_info = ast_threadstorage_get(&thread_lock_info, sizeof(*lock_info)))) @@ -807,10 +813,12 @@ void ast_mark_lock_failed(void *lock_addr) lock_info->locks[lock_info->num_locks - 1].times_locked--; } pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } int ast_find_lock_info(void *lock_addr, char *filename, size_t filename_size, int *lineno, char *func, size_t func_size, char *mutex_name, size_t mutex_name_size) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; int i = 0; @@ -838,10 +846,14 @@ int ast_find_lock_info(void *lock_addr, char *filename, size_t filename_size, in pthread_mutex_unlock(&lock_info->lock); return 0; +#else /* if defined(LOW_MEMORY) */ + return -1; +#endif } void ast_suspend_lock_info(void *lock_addr) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; int i = 0; @@ -865,10 +877,12 @@ void ast_suspend_lock_info(void *lock_addr) lock_info->locks[i].suspended = 1; pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } void ast_restore_lock_info(void *lock_addr) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; int i = 0; @@ -891,6 +905,7 @@ void ast_restore_lock_info(void *lock_addr) lock_info->locks[i].suspended = 0; pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } @@ -900,6 +915,7 @@ void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt) void ast_remove_lock_info(void *lock_addr) #endif { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; int i = 0; @@ -937,8 +953,10 @@ void ast_remove_lock_info(void *lock_addr) lock_info->num_locks--; pthread_mutex_unlock(&lock_info->lock); +#endif /* ! LOW_MEMORY */ } +#if !defined(LOW_MEMORY) static const char *locktype2str(enum ast_lock_type type) { switch (type) { @@ -1017,7 +1035,7 @@ static void append_lock_information(struct ast_str **str, struct thr_lock_info * } ast_reentrancy_unlock(lt); } - +#endif /* ! LOW_MEMORY */ /*! This function can help you find highly temporal locks; locks that happen for a short time, but at unexpected times, usually at times that create a deadlock, @@ -1040,6 +1058,7 @@ static void append_lock_information(struct ast_str **str, struct thr_lock_info * */ void ast_log_show_lock(void *this_lock_addr) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; struct ast_str *str; @@ -1066,11 +1085,13 @@ void ast_log_show_lock(void *this_lock_addr) } pthread_mutex_unlock(&lock_infos_lock.mutex); ast_free(str); +#endif /* ! LOW_MEMORY */ } struct ast_str *ast_dump_locks(void) { +#if !defined(LOW_MEMORY) struct thr_lock_info *lock_info; struct ast_str *str; @@ -1137,8 +1158,12 @@ struct ast_str *ast_dump_locks(void) "\n"); return str; +#else /* if defined(LOW_MEMORY) */ + return NULL; +#endif } +#if !defined(LOW_MEMORY) static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { struct ast_str *str; @@ -1172,9 +1197,10 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_ static struct ast_cli_entry utils_cli[] = { AST_CLI_DEFINE(handle_show_locks, "Show which locks are held by which thread"), }; - +#endif /* ! LOW_MEMORY */ #endif /* DEBUG_THREADS */ +#if !defined(LOW_MEMORY) /* * support for 'show threads'. The start routine is wrapped by * dummy_start(), so that ast_register_thread() and @@ -1236,6 +1262,15 @@ static void *dummy_start(void *data) #endif /* !LOW_MEMORY */ +int ast_background_stacksize(void) +{ +#if !defined(LOW_MEMORY) + return AST_STACKSIZE; +#else + return AST_STACKSIZE_LOW; +#endif +} + int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data, size_t stacksize, const char *file, const char *caller, int line, const char *start_fn) diff --git a/utils/ael_main.c b/utils/ael_main.c index d2c815b3b..1801b12b8 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -32,10 +32,8 @@ ASTERISK_REGISTER_FILE() int option_debug = 0; int option_verbose = 0; -#if !defined(LOW_MEMORY) void __ast_register_file(const char *file) { } void __ast_unregister_file(const char *file) { } -#endif /*** MODULEINFO <depend>res_ael_share</depend> @@ -180,7 +178,6 @@ struct ast_custom_function *ast_custom_function_find(const char *name) return 0; /* in "standalone" mode, functions are just not avail */ } -#if !defined(LOW_MEMORY) int ast_add_profile(const char *x, uint64_t scale) { if (!no_comp) @@ -188,7 +185,6 @@ int ast_add_profile(const char *x, uint64_t scale) return 0; } -#endif int ast_loader_register(int (*updater)(void)) { @@ -606,7 +602,6 @@ unsigned int ast_hashtab_hash_contexts(const void *obj) } #ifdef DEBUG_THREADS -#if !defined(LOW_MEMORY) void ast_mark_lock_acquired(void *lock_addr) { } @@ -652,5 +647,4 @@ void ast_suspend_lock_info(void *lock_addr) void ast_restore_lock_info(void *lock_addr) { } -#endif /* !defined(LOW_MEMORY) */ #endif /* DEBUG_THREADS */ diff --git a/utils/astman.c b/utils/astman.c index 50e6a8901..a6803c8a5 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -98,7 +98,6 @@ void __ast_unregister_file(const char *file) { } -#if !defined(LOW_MEMORY) int ast_add_profile(const char *, uint64_t scale); int ast_add_profile(const char *s, uint64_t scale) { @@ -115,7 +114,6 @@ int64_t ast_mark(int key, int start1_stop0) { return 0; } -#endif /* LOW_MEMORY */ /* end of dummy functions */ diff --git a/utils/check_expr.c b/utils/check_expr.c index 36ff13202..abfb91dcf 100644 --- a/utils/check_expr.c +++ b/utils/check_expr.c @@ -56,7 +56,6 @@ void * attribute_malloc __ast_calloc(size_t num, size_t len, const char *file, i #endif #ifdef DEBUG_THREADS -#if !defined(LOW_MEMORY) #ifdef HAVE_BKTR void ast_store_lock_info(enum ast_lock_type type, const char *filename, int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt); @@ -117,7 +116,6 @@ void ast_mark_lock_acquired(void *foo) { /* not a lot to do in a standalone w/o threading! */ } -#endif #endif /* DEBUG_THREADS */ @@ -161,9 +159,7 @@ void parse_file(const char *fname); void __ast_register_file(const char *file); void __ast_register_file(const char *file) { } -#if !defined(LOW_MEMORY) int ast_add_profile(const char *x, uint64_t scale) { return 0;} -#endif int ast_atomic_fetchadd_int_slow(volatile int *p, int v) { int ret; diff --git a/utils/conf2ael.c b/utils/conf2ael.c index 3136fe378..3ebc56e4a 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -88,9 +88,7 @@ void __ast_unregister_file(const char *file); void __ast_unregister_file(const char *file) { } -#if !defined(LOW_MEMORY) int ast_add_profile(const char *x, uint64_t scale) { return 0;} -#endif /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */ void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf,5,6))); @@ -708,7 +706,6 @@ unsigned int ast_hashtab_hash_contexts(const void *obj) } #ifdef DEBUG_THREADS -#if !defined(LOW_MEMORY) void ast_mark_lock_acquired(void *lock_addr) { } @@ -755,5 +752,4 @@ void ast_suspend_lock_info(void *lock_addr) void ast_restore_lock_info(void *lock_addr) { } -#endif /* !defined(LOW_MEMORY) */ #endif /* DEBUG_THREADS */ |