[svn-commits] tilghman: branch 1.6.1 r187305 - in /branches/1.6.1: ./ agi/ build_tools/ inc...

Thu Apr 9 00:16:30 CDT 2009

Author: tilghman
Date: Thu Apr  9 00:16:25 2009
New Revision: 187305

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187305
Log:
Merged revisions 187302 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r187302 | tilghman | 2009-04-08 23:59:05 -0500 (Wed, 08 Apr 2009) | 14 lines
  
  Merged revisions 187300-187301 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r187300 | tilghman | 2009-04-08 23:31:38 -0500 (Wed, 08 Apr 2009) | 3 lines
    
    Add debugging mode for diagnosing file descriptor leaks.
    (Related to issue #14625)
  ........
    r187301 | tilghman | 2009-04-08 23:32:40 -0500 (Wed, 08 Apr 2009) | 2 lines
    
    Oops, missed this file in the last commit.
  ........
................

Added:
    branches/1.6.1/main/astfd.c
      - copied unchanged from r187302, trunk/main/astfd.c
Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/agi/Makefile
    branches/1.6.1/build_tools/cflags.xml
    branches/1.6.1/include/asterisk.h
    branches/1.6.1/main/Makefile
    branches/1.6.1/main/asterisk.c
    branches/1.6.1/main/file.c
    branches/1.6.1/utils/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/agi/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/agi/Makefile?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================

--- branches/1.6.1/agi/Makefile (original)
+++ branches/1.6.1/agi/Makefile Thu Apr  9 00:16:25 2009
@@ -24,6 +24,8 @@
 endif
 
 include $(ASTTOPDIR)/Makefile.rules
+
+ASTCFLAGS+=-DSTANDALONE
 
 all: $(AGIS)
 

Modified: branches/1.6.1/build_tools/cflags.xml
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/build_tools/cflags.xml?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/build_tools/cflags.xml (original)
+++ branches/1.6.1/build_tools/cflags.xml Thu Apr  9 00:16:25 2009
@@ -7,6 +7,8 @@
 		</member>
 		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
 			<defaultenabled>yes</defaultenabled>
+		</member>
+		<member name="DEBUG_FD_LEAKS" displayname="Enable File Descriptor Leak Detection">
 		</member>
 		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
 		</member>

Modified: branches/1.6.1/include/asterisk.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk.h?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/include/asterisk.h (original)
+++ branches/1.6.1/include/asterisk.h Thu Apr  9 00:16:25 2009
@@ -43,7 +43,36 @@
 #define	setpriority	__PLEASE_USE_ast_set_priority_INSTEAD_OF_setpriority__
 #define	sched_setscheduler	__PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__
 
+#if defined(DEBUG_FD_LEAKS) && !defined(STANDALONE) && !defined(STANDALONE_AEL)
+/* These includes are all about ordering */
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#define	open(a,...)	__ast_fdleak_open(__FILE__,__LINE__,__PRETTY_FUNCTION__, a, __VA_ARGS__)
+#define pipe(a)	__ast_fdleak_pipe(a, __FILE__,__LINE__,__PRETTY_FUNCTION__)
+#define socket(a,b,c)	__ast_fdleak_socket(a, b, c, __FILE__,__LINE__,__PRETTY_FUNCTION__)
+#define close(a)	__ast_fdleak_close(a)
+#define	fopen(a,b)	__ast_fdleak_fopen(a, b, __FILE__,__LINE__,__PRETTY_FUNCTION__)
+#define	fclose(a)	__ast_fdleak_fclose(a)
+#define	dup2(a,b)	__ast_fdleak_dup2(a, b, __FILE__,__LINE__,__PRETTY_FUNCTION__)
+#define dup(a)	__ast_fdleak_dup(a, __FILE__,__LINE__,__PRETTY_FUNCTION__)
+
+int __ast_fdleak_open(const char *file, int line, const char *func, const char *path, int flags, ...);
+int __ast_fdleak_pipe(int *fds, const char *file, int line, const char *func);
+int __ast_fdleak_socket(int domain, int type, int protocol, const char *file, int line, const char *func);
+int __ast_fdleak_close(int fd);
+FILE *__ast_fdleak_fopen(const char *path, const char *mode, const char *file, int line, const char *func);
+int __ast_fdleak_fclose(FILE *ptr);
+int __ast_fdleak_dup2(int oldfd, int newfd, const char *file, int line, const char *func);
+int __ast_fdleak_dup(int oldfd, const char *file, int line, const char *func);
+#endif
+
 int ast_set_priority(int);			/*!< Provided by asterisk.c */
+int ast_fd_init(void);				/*!< Provided by astfd.c */
 
 /*!
  * \brief Register a function to be executed before Asterisk exits.

Modified: branches/1.6.1/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/Makefile?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/main/Makefile (original)
+++ branches/1.6.1/main/Makefile Thu Apr  9 00:16:25 2009
@@ -22,7 +22,7 @@
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
 	cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
-	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
+	astmm.o astfd.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
 	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
 	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \

Modified: branches/1.6.1/main/asterisk.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/asterisk.c?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/main/asterisk.c (original)
+++ branches/1.6.1/main/asterisk.c Thu Apr  9 00:16:25 2009
@@ -2985,6 +2985,7 @@
 	ast_utils_init();
 	tdd_init();
 	ast_tps_init();
+	ast_fd_init();
 
 	if (getenv("HOME")) 
 		snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));

Modified: branches/1.6.1/main/file.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Thu Apr  9 00:16:25 2009
@@ -314,8 +314,10 @@
 		free(f->filename);
 	if (f->realfilename)
 		free(f->realfilename);
-	if (f->fmt->close)
-		f->fmt->close(f);
+	if (f->fmt->close) {
+		void (*closefn)(struct ast_filestream *) = f->fmt->close;
+		closefn(f);
+	}
 	if (f->f)
 		fclose(f->f);
 	if (f->vfs)
@@ -353,8 +355,9 @@
 {
 	struct ast_format *f = s->fmt;
 	int ret = -1;
-
-	if (mode == WRAP_OPEN && f->open && f->open(s))
+	int (*openfn)(struct ast_filestream *s);
+
+	if (mode == WRAP_OPEN && (openfn = f->open) && openfn(s))
 		ast_log(LOG_WARNING, "Unable to open format %s\n", f->name);
 	else if (mode == WRAP_REWRITE && f->rewrite && f->rewrite(s, comment))
 		ast_log(LOG_WARNING, "Unable to rewrite format %s\n", f->name);

Modified: branches/1.6.1/utils/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/utils/Makefile?view=diff&rev=187305&r1=187304&r2=187305
==============================================================================
--- branches/1.6.1/utils/Makefile (original)
+++ branches/1.6.1/utils/Makefile Thu Apr  9 00:16:25 2009
@@ -94,7 +94,7 @@
 
 astman: astman.o md5.o
 astman: LIBS+=$(NEWT_LIB)
-astman.o: ASTCFLAGS+=-DSTANDALONE
+astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG -DSTANDALONE
 
 stereorize: stereorize.o frame.o
 stereorize: LIBS+=-lm
@@ -190,6 +190,8 @@
 	rm ast_expr2z.o ast_expr2fz.o 
 	./check_expr2 expr2.testinput
 
+smsq.o: ASTCFLAGS+=-DSTANDALONE
+
 smsq: smsq.o strcompat.o
 smsq: LIBS+=$(POPT_LIB)
 


