[asterisk-commits] kpfleming: trunk r49463 - in /trunk: ./ channels/ codecs/ main/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jan  4 12:19:55 2007
New Revision: 49463

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49463
Log:
Merged revisions 49457,49460-49461 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49457 | kpfleming | 2007-01-04 12:05:47 -0600 (Thu, 04 Jan 2007) | 2 lines

make building of codec_gsm against the system GSM library actually work

........
r49460 | kpfleming | 2007-01-04 12:16:40 -0600 (Thu, 04 Jan 2007) | 2 lines

don't define this type either if LOW_MEMORY is enabled

........
r49461 | kpfleming | 2007-01-04 12:17:01 -0600 (Thu, 04 Jan 2007) | 2 lines

don't do frame header caching in the core if LOW_MEMORY is defined

........

Modified:
    trunk/   (props changed)
    trunk/channels/iax2-parser.c
    trunk/codecs/Makefile
    trunk/main/frame.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/iax2-parser.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/iax2-parser.c?view=diff&rev=49463&r1=49462&r2=49463
==============================================================================
--- trunk/channels/iax2-parser.c (original)
+++ trunk/channels/iax2-parser.c Thu Jan  4 12:19:55 2007
@@ -55,11 +55,11 @@
 
 /*! \brief A per-thread cache of iax_frame structures */
 AST_THREADSTORAGE_CUSTOM(frame_cache, NULL, frame_cache_cleanup);
-#endif
 
 /*! \brief This is just so iax_frames, a list head struct for holding a list of
  *  iax_frame structures, is defined. */
 AST_LIST_HEAD_NOLOCK(iax_frames, iax_frame);
+#endif
 
 static void internaloutput(const char *str)
 {

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?view=diff&rev=49463&r1=49462&r2=49463
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Thu Jan  4 12:19:55 2007
@@ -31,7 +31,7 @@
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
-ifneq ($(GSM_INTERNAL),)
+ifneq ($(GSM_INTERNAL),no)
 GSM_INCLUDE:=-Igsm/inc
 $(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a
 endif

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=49463&r1=49462&r2=49463
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Thu Jan  4 12:19:55 2007
@@ -49,6 +49,7 @@
 static AST_LIST_HEAD_STATIC(headerlist, ast_frame);
 #endif
 
+#if !defined(LOW_MEMORY)
 static void frame_cache_cleanup(void *data);
 
 /*! \brief A per-thread cache of frame headers */
@@ -73,6 +74,7 @@
 	struct ast_frames list;
 	size_t size;
 };
+#endif
 
 #define SMOOTHER_SIZE 8000
 
@@ -288,6 +290,8 @@
 static struct ast_frame *ast_frame_header_new(void)
 {
 	struct ast_frame *f;
+
+#if !defined(LOW_MEMORY)
 	struct ast_frame_cache *frames;
 
 	if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames)))) {
@@ -300,6 +304,7 @@
 			return f;
 		}
 	}
+#endif
 
 	if (!(f = ast_calloc_cache(1, sizeof(*f))))
 		return NULL;
@@ -315,6 +320,7 @@
 	return f;
 }
 
+#if !defined(LOW_MEMORY)
 static void frame_cache_cleanup(void *data)
 {
 	struct ast_frame_cache *frames = data;
@@ -325,12 +331,14 @@
 	
 	free(frames);
 }
+#endif
 
 void ast_frame_free(struct ast_frame *fr, int cache)
 {
 	if (!fr->mallocd)
 		return;
 
+#if !defined(LOW_MEMORY)
 	if (cache && fr->mallocd == AST_MALLOCD_HDR) {
 		/* Cool, only the header is malloc'd, let's just cache those for now 
 		 * to keep things simple... */
@@ -343,6 +351,7 @@
 			return;
 		}
 	}
+#endif
 	
 	if (fr->mallocd & AST_MALLOCD_DATA) {
 		if (fr->data) 
@@ -426,10 +435,13 @@
 
 struct ast_frame *ast_frdup(const struct ast_frame *f)
 {
-	struct ast_frame_cache *frames;
 	struct ast_frame *out = NULL;
 	int len, srclen = 0;
 	void *buf = NULL;
+
+#if !defined(LOW_MEMORY)
+	struct ast_frame_cache *frames;
+#endif
 
 	/* Start with standard stuff */
 	len = sizeof(*out) + AST_FRIENDLY_OFFSET + f->datalen;
@@ -443,6 +455,7 @@
 	if (srclen > 0)
 		len += srclen + 1;
 	
+#if !defined(LOW_MEMORY)
 	if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames)))) {
 		AST_LIST_TRAVERSE_SAFE_BEGIN(&frames->list, out, frame_list) {
 			if (out->mallocd_hdr_len >= len) {
@@ -457,6 +470,8 @@
 		}
 		AST_LIST_TRAVERSE_SAFE_END
 	}
+#endif
+
 	if (!buf) {
 		if (!(buf = ast_calloc_cache(1, len)))
 			return NULL;