kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision 153709 from trunk

Browse Source 
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines

instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.


------------------------------------------------------------------------



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-03 00:21:04 +00:00
parent 1036849a42
commit d660c03fdc
7 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/app_stack.c
View File

@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
<depend>res_agi</depend>
<use>res_agi</use>
***/
#include "asterisk.h"
@@ -38,9 +38,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h"
#include "asterisk/manager.h"
#include "asterisk/channel.h"
/* usage of AGI is optional, so indicate that to the header file */
#define ASTERISK_AGI_OPTIONAL
#include "asterisk/agi.h"
static int agi_loaded = 0;
static const char *app_gosub = "Gosub";
static const char *app_gosubif = "GosubIf";
@@ -492,7 +494,7 @@ static int unload_module(void)
{
struct ast_context *con;
if (agi_loaded) {
if (ast_agi_unregister) {
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
@@ -514,15 +516,10 @@ static int load_module(void)
{
struct ast_context *con;
if (!ast_module_check("res_agi.so")) {
if (ast_load_resource("res_agi.so") == AST_MODULE_LOAD_SUCCESS) {
agi_loaded = 1;
}
} else {
agi_loaded = 1;
}
if (agi_loaded) {
/* usage of AGI is optional, so check to see if the ast_agi_register()
function is available; if so, use it.
*/
if (ast_agi_register) {
con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack");
if (!con) {
ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n");

2
autoconf/ast_gcc_attribute.m4
View File

@@ -7,7 +7,7 @@ AC_MSG_CHECKING(for compiler 'attribute $1' support)
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([static void __attribute__(($1)) *test(void *muffin, ...) {}],
AC_LANG_PROGRAM([void __attribute__(($1)) *test(void *muffin, ...) {}],
[]),
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),

74
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 150211 .
# From configure.ac Revision: 151245 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -16710,7 +16710,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((pure)) *test(void *muffin, ...) {}
void __attribute__((pure)) *test(void *muffin, ...) {}
int
main ()
{
@@ -16766,7 +16766,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((malloc)) *test(void *muffin, ...) {}
void __attribute__((malloc)) *test(void *muffin, ...) {}
int
main ()
{
@@ -16822,7 +16822,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((const)) *test(void *muffin, ...) {}
void __attribute__((const)) *test(void *muffin, ...) {}
int
main ()
{
@@ -16878,7 +16878,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((unused)) *test(void *muffin, ...) {}
void __attribute__((unused)) *test(void *muffin, ...) {}
int
main ()
{
@@ -16934,7 +16934,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((always_inline)) *test(void *muffin, ...) {}
void __attribute__((always_inline)) *test(void *muffin, ...) {}
int
main ()
{
@@ -16990,7 +16990,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((deprecated)) *test(void *muffin, ...) {}
void __attribute__((deprecated)) *test(void *muffin, ...) {}
int
main ()
{
@@ -17046,7 +17046,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((sentinel)) *test(void *muffin, ...) {}
void __attribute__((sentinel)) *test(void *muffin, ...) {}
int
main ()
{
@@ -17102,7 +17102,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
static void __attribute__((warn_unused_result)) *test(void *muffin, ...) {}
void __attribute__((warn_unused_result)) *test(void *muffin, ...) {}
int
main ()
{
@@ -17148,6 +17148,62 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
{ echo "$as_me:$LINENO: checking for compiler 'attribute weak' support" >&5
echo $ECHO_N "checking for compiler 'attribute weak' support... $ECHO_C" >&6; }
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
void __attribute__((weak)) *test(void *muffin, ...) {}
int
main ()
{
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define HAVE_ATTRIBUTE_weak 1
_ACEOF
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
{ echo "$as_me:$LINENO: checking for -ffunction-sections support" >&5
echo $ECHO_N "checking for -ffunction-sections support... $ECHO_C" >&6; }
saved_CFLAGS="${CFLAGS}"

1
configure.ac
View File

@@ -455,6 +455,7 @@ AST_GCC_ATTRIBUTE(always_inline)
AST_GCC_ATTRIBUTE(deprecated)
AST_GCC_ATTRIBUTE(sentinel)
AST_GCC_ATTRIBUTE(warn_unused_result)
AST_GCC_ATTRIBUTE(weak)
AC_MSG_CHECKING(for -ffunction-sections support)
saved_CFLAGS="${CFLAGS}"

16
include/asterisk/agi.h
View File

@@ -55,11 +55,17 @@ typedef struct agi_command {
AST_LIST_ENTRY(agi_command) list;
} agi_command;
int ast_agi_fdprintf(struct ast_channel *chan, int fd, char *fmt, ...);
int ast_agi_register(struct ast_module *mod, agi_command *cmd);
int ast_agi_unregister(struct ast_module *mod, agi_command *cmd);
void ast_agi_register_multiple(struct ast_module *mod, agi_command *cmd, int len);
void ast_agi_unregister_multiple(struct ast_module *mod, agi_command *cmd, int len);
#if defined(ASTERISK_AGI_OPTIONAL)
#define AGI_WEAK attribute_weak
#else
#define AGI_WEAK
#endif
int AGI_WEAK ast_agi_fdprintf(struct ast_channel *chan, int fd, char *fmt, ...);
int AGI_WEAK ast_agi_register(struct ast_module *mod, agi_command *cmd);
int AGI_WEAK ast_agi_unregister(struct ast_module *mod, agi_command *cmd);
void AGI_WEAK ast_agi_register_multiple(struct ast_module *mod, agi_command *cmd, int len);
void AGI_WEAK ast_agi_unregister_multiple(struct ast_module *mod, agi_command *cmd, int len);
#if defined(__cplusplus) || defined(c_plusplus)
}

3
include/asterisk/autoconfig.h.in
View File

@@ -117,6 +117,9 @@
attribute. */
#undef HAVE_ATTRIBUTE_warn_unused_result
/* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
#undef HAVE_ATTRIBUTE_weak
/* Define this to indicate the ${BKTR_DESCRIP} library */
#undef HAVE_BKTR

6
include/asterisk/compiler.h
View File

@@ -68,4 +68,10 @@
/* Some older version of GNU gcc (3.3.5 on OpenBSD 4.3 for example) dont like 'NULL' as sentinel */
#define SENTINEL ((char *)NULL)
#ifdef HAVE_ATTRIBUTE_weak
#define attribute_weak __attribute__((weak))
#else
#define attribute_weak
#endif
#endif /* _ASTERISK_COMPILER_H */