[asterisk-commits] murf: branch murf/bug6002 r105550 - in /team/murf/bug6002: pbx/ res/ael/ utils/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat Mar 1 22:20:14 CST 2008
Author: murf
Date: Sat Mar 1 22:20:14 2008
New Revision: 105550
URL: http://svn.digium.com/view/asterisk?view=rev&rev=105550
Log:
some changes so things link when THREAD_DEBUG is turned on. Fix some reload crashes.
Modified:
team/murf/bug6002/pbx/pbx_ael.c
team/murf/bug6002/pbx/pbx_config.c
team/murf/bug6002/res/ael/ael.flex
team/murf/bug6002/res/ael/ael_lex.c
team/murf/bug6002/utils/ael_main.c
team/murf/bug6002/utils/conf2ael.c
team/murf/bug6002/utils/extconf.c
Modified: team/murf/bug6002/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/pbx/pbx_ael.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/pbx/pbx_ael.c (original)
+++ team/murf/bug6002/pbx/pbx_ael.c Sat Mar 1 22:20:14 2008
@@ -136,6 +136,7 @@
ast_merge_contexts_and_delete(&local_contexts, local_table, registrar);
local_table = NULL; /* it's the dialplan global now */
+ local_contexts = NULL;
ast_log(LOG_NOTICE, "AEL load process: merged config file name '%s'.\n", rfilename);
for (con = ast_walk_contexts(NULL); con; con = ast_walk_contexts(con))
ast_context_verify_includes(con);
Modified: team/murf/bug6002/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/pbx/pbx_config.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/pbx/pbx_config.c (original)
+++ team/murf/bug6002/pbx/pbx_config.c Sat Mar 1 22:20:14 2008
@@ -1634,6 +1634,8 @@
pbx_load_users();
ast_merge_contexts_and_delete(&local_contexts, local_table, registrar);
+ local_table = NULL; /* the local table has been moved into the global one. */
+ local_contexts = NULL;
for (con = NULL; (con = ast_walk_contexts(con));)
ast_context_verify_includes(con);
Modified: team/murf/bug6002/res/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/res/ael/ael.flex?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/res/ael/ael.flex (original)
+++ team/murf/bug6002/res/ael/ael.flex Sat Mar 1 22:20:14 2008
@@ -60,6 +60,7 @@
%option bison-locations
%{
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/types.h>
@@ -70,7 +71,6 @@
#define GLOB_ABORTED GLOB_ABEND
#endif
# include <glob.h>
-
#include "asterisk/logger.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
Modified: team/murf/bug6002/res/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/res/ael/ael_lex.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/res/ael/ael_lex.c (original)
+++ team/murf/bug6002/res/ael/ael_lex.c Sat Mar 1 22:20:14 2008
@@ -793,6 +793,7 @@
* bison-locations is probably not needed.
*/
#line 63 "ael.flex"
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/types.h>
@@ -803,7 +804,6 @@
#define GLOB_ABORTED GLOB_ABEND
#endif
# include <glob.h>
-
#include "asterisk/logger.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
Modified: team/murf/bug6002/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/utils/ael_main.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/utils/ael_main.c (original)
+++ team/murf/bug6002/utils/ael_main.c Sat Mar 1 22:20:14 2008
@@ -599,3 +599,15 @@
return 0;
}
+void ast_mark_lock_acquired(void *lock_addr)
+{
+}
+
+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)
+{
+}
Modified: team/murf/bug6002/utils/conf2ael.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/utils/conf2ael.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/utils/conf2ael.c (original)
+++ team/murf/bug6002/utils/conf2ael.c Sat Mar 1 22:20:14 2008
@@ -697,3 +697,15 @@
return 0;
}
+void ast_mark_lock_acquired(void *lock_addr)
+{
+}
+
+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)
+{
+}
Modified: team/murf/bug6002/utils/extconf.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6002/utils/extconf.c?view=diff&rev=105550&r1=105549&r2=105550
==============================================================================
--- team/murf/bug6002/utils/extconf.c (original)
+++ team/murf/bug6002/utils/extconf.c Sat Mar 1 22:20:14 2008
@@ -23,6 +23,7 @@
* for operations outside of asterisk. A huge, awful hack.
*
*/
+#undef DEBUG_THREADS
#include "asterisk/compat.h"
#include "asterisk/paths.h" /* we use AST_CONFIG_DIR */
@@ -65,6 +66,87 @@
#include "asterisk/inline_api.h"
#include "asterisk/endian.h"
#include "asterisk/ast_expr.h"
+
+/* logger.h */
+
+#define EVENTLOG "event_log"
+#define QUEUELOG "queue_log"
+
+#define DEBUG_M(a) { \
+ a; \
+}
+
+#define VERBOSE_PREFIX_1 " "
+#define VERBOSE_PREFIX_2 " == "
+#define VERBOSE_PREFIX_3 " -- "
+#define VERBOSE_PREFIX_4 " > "
+
+/* IN CONFLICT: void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
+ __attribute__ ((format (printf, 5, 6))); */
+
+static void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
+
+
+void ast_backtrace(void);
+
+void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
+ __attribute__ ((format (printf, 5, 6)));
+
+/* IN CONFLICT: void ast_verbose(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2))); */
+
+int ast_register_verbose(void (*verboser)(const char *string));
+int ast_unregister_verbose(void (*verboser)(const char *string));
+
+void ast_console_puts(const char *string);
+
+void ast_console_puts_mutable(const char *string);
+void ast_console_toggle_mute(int fd);
+
+#define _A_ __FILE__, __LINE__, __PRETTY_FUNCTION__
+
+#ifdef LOG_DEBUG
+#undef LOG_DEBUG
+#endif
+#define __LOG_DEBUG 0
+#define LOG_DEBUG __LOG_DEBUG, _A_
+
+#ifdef LOG_EVENT
+#undef LOG_EVENT
+#endif
+#define __LOG_EVENT 1
+#define LOG_EVENT __LOG_EVENT, _A_
+
+#ifdef LOG_NOTICE
+#undef LOG_NOTICE
+#endif
+#define __LOG_NOTICE 2
+#define LOG_NOTICE __LOG_NOTICE, _A_
+
+#ifdef LOG_WARNING
+#undef LOG_WARNING
+#endif
+#define __LOG_WARNING 3
+#define LOG_WARNING __LOG_WARNING, _A_
+
+#ifdef LOG_ERROR
+#undef LOG_ERROR
+#endif
+#define __LOG_ERROR 4
+#define LOG_ERROR __LOG_ERROR, _A_
+
+#ifdef LOG_VERBOSE
+#undef LOG_VERBOSE
+#endif
+#define __LOG_VERBOSE 5
+#define LOG_VERBOSE __LOG_VERBOSE, _A_
+
+#ifdef LOG_DTMF
+#undef LOG_DTMF
+#endif
+#define __LOG_DTMF 6
+#define LOG_DTMF __LOG_DTMF, _A_
+
/* lock.h */
#ifndef HAVE_MTX_PROFILE
@@ -804,85 +886,6 @@
#include "asterisk/hashtab.h"
#include "asterisk/ael_structs.h"
#include "asterisk/pval.h"
-
-/* logger.h */
-#define EVENTLOG "event_log"
-#define QUEUELOG "queue_log"
-
-#define DEBUG_M(a) { \
- a; \
-}
-
-#define VERBOSE_PREFIX_1 " "
-#define VERBOSE_PREFIX_2 " == "
-#define VERBOSE_PREFIX_3 " -- "
-#define VERBOSE_PREFIX_4 " > "
-
-/* IN CONFLICT: void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
- __attribute__ ((format (printf, 5, 6))); */
-
-static void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
-
-
-void ast_backtrace(void);
-
-void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
- __attribute__ ((format (printf, 5, 6)));
-
-/* IN CONFLICT: void ast_verbose(const char *fmt, ...)
- __attribute__ ((format (printf, 1, 2))); */
-
-int ast_register_verbose(void (*verboser)(const char *string));
-int ast_unregister_verbose(void (*verboser)(const char *string));
-
-void ast_console_puts(const char *string);
-
-void ast_console_puts_mutable(const char *string);
-void ast_console_toggle_mute(int fd);
-
-#define _A_ __FILE__, __LINE__, __PRETTY_FUNCTION__
-
-#ifdef LOG_DEBUG
-#undef LOG_DEBUG
-#endif
-#define __LOG_DEBUG 0
-#define LOG_DEBUG __LOG_DEBUG, _A_
-
-#ifdef LOG_EVENT
-#undef LOG_EVENT
-#endif
-#define __LOG_EVENT 1
-#define LOG_EVENT __LOG_EVENT, _A_
-
-#ifdef LOG_NOTICE
-#undef LOG_NOTICE
-#endif
-#define __LOG_NOTICE 2
-#define LOG_NOTICE __LOG_NOTICE, _A_
-
-#ifdef LOG_WARNING
-#undef LOG_WARNING
-#endif
-#define __LOG_WARNING 3
-#define LOG_WARNING __LOG_WARNING, _A_
-
-#ifdef LOG_ERROR
-#undef LOG_ERROR
-#endif
-#define __LOG_ERROR 4
-#define LOG_ERROR __LOG_ERROR, _A_
-
-#ifdef LOG_VERBOSE
-#undef LOG_VERBOSE
-#endif
-#define __LOG_VERBOSE 5
-#define LOG_VERBOSE __LOG_VERBOSE, _A_
-
-#ifdef LOG_DTMF
-#undef LOG_DTMF
-#endif
-#define __LOG_DTMF 6
-#define LOG_DTMF __LOG_DTMF, _A_
/* from utils.h */
More information about the asterisk-commits
mailing list