[svn-commits] mmichelson: branch mmichelson/threadpool r377879 - in /team/mmichelson/thread...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Dec 11 15:52:12 CST 2012


Author: mmichelson
Date: Tue Dec 11 15:52:09 2012
New Revision: 377879

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377879
Log:
Add automerge property back after conflict.


Added:
    team/mmichelson/threadpool/include/asterisk/uuid.h
      - copied unchanged from r377878, trunk/include/asterisk/uuid.h
    team/mmichelson/threadpool/main/uuid.c
      - copied unchanged from r377878, trunk/main/uuid.c
    team/mmichelson/threadpool/tests/test_uuid.c
      - copied unchanged from r377878, trunk/tests/test_uuid.c
Modified:
    team/mmichelson/threadpool/   (props changed)
    team/mmichelson/threadpool/configure
    team/mmichelson/threadpool/configure.ac
    team/mmichelson/threadpool/include/asterisk/autoconfig.h.in
    team/mmichelson/threadpool/main/Makefile
    team/mmichelson/threadpool/main/asterisk.c
    team/mmichelson/threadpool/main/udptl.c

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/mmichelson/threadpool/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 11 15:52:09 2012
@@ -1,1 +1,1 @@
-/trunk:1-377815
+/trunk:1-377878

Modified: team/mmichelson/threadpool/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/configure.ac?view=diff&rev=377879&r1=377878&r2=377879
==============================================================================
--- team/mmichelson/threadpool/configure.ac (original)
+++ team/mmichelson/threadpool/configure.ac Tue Dec 11 15:52:09 2012
@@ -489,11 +489,12 @@
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
 
-# Any one of these 4 packages support a mandatory requirement, so we want to check on them as early as possible.
+# Any one of these 5 packages support a mandatory requirement, so we want to check on them as early as possible.
 AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
 AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
 AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
+AST_EXT_LIB_CHECK([UUID], [uuid], [uuid_generate_random], [uuid.h], [-luuid])
 
 EDITLINE_LIB=""
 if test "x$TERMCAP_LIB" != "x" ; then

Modified: team/mmichelson/threadpool/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/include/asterisk/autoconfig.h.in?view=diff&rev=377879&r1=377878&r2=377879
==============================================================================
--- team/mmichelson/threadpool/include/asterisk/autoconfig.h.in (original)
+++ team/mmichelson/threadpool/include/asterisk/autoconfig.h.in Tue Dec 11 15:52:09 2012
@@ -848,19 +848,19 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
 
-/* Define to 1 if `uid' is member of `struct sockpeercred'. */
+/* Define to 1 if `uid' is a member of `struct sockpeercred'. */
 #undef HAVE_STRUCT_SOCKPEERCRED_UID
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `cr_uid' is member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_CR_UID
 
-/* Define to 1 if `uid' is member of `struct ucred'. */
+/* Define to 1 if `uid' is a member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_UID
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1137,6 +1137,9 @@
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

Modified: team/mmichelson/threadpool/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/Makefile?view=diff&rev=377879&r1=377878&r2=377879
==============================================================================
--- team/mmichelson/threadpool/main/Makefile (original)
+++ team/mmichelson/threadpool/main/Makefile Tue Dec 11 15:52:09 2012
@@ -43,7 +43,7 @@
   ifneq (x$(CAP_LIB),x)
     AST_LIBS+=$(CAP_LIB)
   endif
-  AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv
+  AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv -luuid
 else
   AST_LIBS+=$(EDITLINE_LIB) -lm
 endif

Modified: team/mmichelson/threadpool/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/asterisk.c?view=diff&rev=377879&r1=377878&r2=377879
==============================================================================
--- team/mmichelson/threadpool/main/asterisk.c (original)
+++ team/mmichelson/threadpool/main/asterisk.c Tue Dec 11 15:52:09 2012
@@ -238,6 +238,7 @@
 #include "asterisk/rtp_engine.h"
 #include "asterisk/format.h"
 #include "asterisk/aoc.h"
+#include "asterisk/uuid.h"
 
 #include "../defaults.h"
 
@@ -4112,6 +4113,7 @@
 	}
 
 	ast_aoc_cli_init();
+	ast_uuid_init();
 
 	ast_makesocket();
 	sigemptyset(&sigs);

Modified: team/mmichelson/threadpool/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/threadpool/main/udptl.c?view=diff&rev=377879&r1=377878&r2=377879
==============================================================================
--- team/mmichelson/threadpool/main/udptl.c (original)
+++ team/mmichelson/threadpool/main/udptl.c Tue Dec 11 15:52:09 2012
@@ -1471,9 +1471,13 @@
 	return 0;
 }
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void udptl_shutdown(void)
 {
+	ast_cli_unregister_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
 	ao2_t_global_obj_release(globals, "Unref udptl global container in shutdown");
 	aco_info_destroy(&cfg_info);
 }
@@ -1509,9 +1513,9 @@
 	aco_option_register_custom(&cfg_info, "t38faxudpec", ACO_EXACT, general_options, NULL, removed_options_handler, 0);
 	aco_option_register_custom(&cfg_info, "t38faxmaxdatagram", ACO_EXACT, general_options, NULL, removed_options_handler, 0);
 
+	__ast_udptl_reload(0);
+
 	ast_cli_register_multiple(cli_udptl, ARRAY_LEN(cli_udptl));
 
-	__ast_udptl_reload(0);
-
 	ast_register_atexit(udptl_shutdown);
 }




More information about the svn-commits mailing list