kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Single API for ast_store_lock_info and ast_remove_lock_info.

Browse Source 
This makes the 'bt' parameter unconditional for ast_store_lock_info and
ast_remove_lock_info.  The 'bt' parameter is unused when HAVE_BKTR is
undefined.

Change-Id: Ieced0e920928b735a39c3b5952b806c473d67453
This commit is contained in:
Corey Farrell
2017-10-23 01:55:18 -04:00
parent 0b05dafc89
commit 569e9a8391
6 changed files with 16 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utils/ael_main.c
View File

@@ -601,7 +601,6 @@ unsigned int ast_hashtab_hash_contexts(const void *obj)
void ast_mark_lock_acquired(void *lock_addr)
{
}
#ifdef HAVE_BKTR
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
{
}
@@ -611,6 +610,7 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename,
{
}
#ifdef HAVE_BKTR
int __ast_bt_get_addresses(struct ast_bt *bt)
{
return 0;
@@ -627,15 +627,6 @@ char **__ast_bt_get_symbols(void **addresses, size_t num_frames)
}
return foo;
}
#else
void ast_remove_lock_info(void *lock_addr)
{
}
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 */
void ast_suspend_lock_info(void *lock_addr)
{

16
utils/check_expr.c
View File

@@ -55,7 +55,6 @@ void * attribute_malloc __ast_calloc(size_t num, size_t len, const char *file, i
#endif
#ifdef DEBUG_THREADS
#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);
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
@@ -70,6 +69,7 @@ void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
/* not a lot to do in a standalone w/o threading! */
}
#ifdef HAVE_BKTR
int __ast_bt_get_addresses(struct ast_bt *bt);
int __ast_bt_get_addresses(struct ast_bt *bt)
{
@@ -88,20 +88,6 @@ char **__ast_bt_get_symbols(void **addresses, size_t num_frames)
}
return foo;
}
#else
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);
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)
{
/* not a lot to do in a standalone w/o threading! */
}
void ast_remove_lock_info(void *lock_addr);
void ast_remove_lock_info(void *lock_addr)
{
/* not a lot to do in a standalone w/o threading! */
}
#endif /* HAVE_BKTR */
void ast_suspend_lock_info(void *lock_addr)

12
utils/conf2ael.c
View File

@@ -699,7 +699,6 @@ unsigned int ast_hashtab_hash_contexts(const void *obj)
void ast_mark_lock_acquired(void *lock_addr)
{
}
#ifdef HAVE_BKTR
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
{
}
@@ -709,6 +708,7 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename,
{
}
#ifdef HAVE_BKTR
int __ast_bt_get_addresses(struct ast_bt *bt)
{
return 0;
@@ -725,16 +725,6 @@ char **__ast_bt_get_symbols(void **addresses, size_t num_frames)
}
return foo;
}
#else
void ast_remove_lock_info(void *lock_addr)
{
}
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 */
void ast_suspend_lock_info(void *lock_addr)
{