[asterisk-commits] murf: branch murf/bug_7638 r59140 - /team/murf/bug_7638/utils/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Mar 21 21:49:42 2007
New Revision: 59140

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59140
Log:
Yay! con2ael is now also working, using the extconf standalone extensions.conf reader!

Modified:
    team/murf/bug_7638/utils/conf2ael.c
    team/murf/bug_7638/utils/extconf.c

Modified: team/murf/bug_7638/utils/conf2ael.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/utils/conf2ael.c?view=diff&rev=59140&r1=59139&r2=59140
==============================================================================
--- team/murf/bug_7638/utils/conf2ael.c (original)
+++ team/murf/bug_7638/utils/conf2ael.c Wed Mar 21 21:49:42 2007
@@ -198,7 +198,7 @@
 
 /*! \brief ast_context: An extension context */
 struct ast_context {
-	ast_mutex_t lock; 			/*!< A lock to prevent multiple threads from clobbering the context */
+	ast_rwlock_t lock; 			/*!< A lock to prevent multiple threads from clobbering the context */
 	struct ast_exten *root;			/*!< The root of the list of extensions */
 	struct ast_context *next;		/*!< Link them together */
 	struct ast_include *includes;		/*!< Include other contexts */
@@ -360,6 +360,16 @@
 	
 	printf("... Done!\n");
 	
+	tmp = 0;
+	while ((tmp = localized_walk_contexts(tmp)) ) {
+		printf("Context: %s\n", tmp->name);
+	}
+	printf("=========\n");
+	printf("Sizeof(context)=%d\n", sizeof(struct ast_context));
+	printf("Sizeof(exten)=%d\n", sizeof(struct ast_exten));
+	printf("Sizeof(include)=%d\n", sizeof(struct ast_include));
+	printf("Sizeof(ignorepat)=%d\n", sizeof(struct ast_ignorepat));
+	printf("Sizeof(sw)=%d\n", sizeof(struct ast_sw));
 	tmp = 0;
 	while ((tmp = localized_walk_contexts(tmp)) ) {
 		/* printf("Context: %s\n", tmp->name); */

Modified: team/murf/bug_7638/utils/extconf.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7638/utils/extconf.c?view=diff&rev=59140&r1=59139&r2=59140
==============================================================================
--- team/murf/bug_7638/utils/extconf.c (original)
+++ team/murf/bug_7638/utils/extconf.c Wed Mar 21 21:49:42 2007
@@ -5894,6 +5894,19 @@
 	for (con = NULL; (con = ast_walk_contexts(con));)
 		ast_context_verify_includes(con);
 
+	con = 0;
+	while ((con = ast_walk_contexts(con)) ) {
+		printf("Context: %s\n", con->name);
+	}
+	printf("=========\n");
+	printf("Sizeof(context)=%d\n", sizeof(struct ast_context));
+	printf("Sizeof(exten)=%d\n", sizeof(struct ast_exten));
+	printf("Sizeof(include)=%d\n", sizeof(struct ast_include));
+	printf("Sizeof(ignorepat)=%d\n", sizeof(struct ast_ignorepat));
+	printf("Sizeof(sw)=%d\n", sizeof(struct ast_sw));
+	printf("=========\n");
+	printf("=========\n");
+	
 	/* not right now pbx_set_autofallthrough(autofallthrough_config); */
 
 	return 0;