[asterisk-commits] mogorman: trunk r49462 - in /trunk: ./ channels/iax2-parser.c

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Thu Jan  4 12:17:24 2007
New Revision: 49462

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49462
Log:
Merged revisions 49458 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.4

........
r49458 | kpfleming | 2007-01-04 12:06:51 -0600 (Thu, 04 Jan 2007) | 2 lines

don't do frame caching in LOW_MEMORY mode

........

Modified:
    trunk/   (props changed)
    trunk/channels/iax2-parser.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=49462&r1=49461&r2=49462
==============================================================================
--- trunk/channels/iax2-parser.c (original)
+++ trunk/channels/iax2-parser.c Thu Jan  4 12:17:24 2007
@@ -50,10 +50,12 @@
 static int iframes = 0;
 static int oframes = 0;
 
+#if !defined(LOW_MEMORY)
 static void frame_cache_cleanup(void *data);
 
 /*! \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. */
@@ -940,6 +942,8 @@
 struct iax_frame *iax_frame_new(int direction, int datalen)
 {
 	struct iax_frame *fr = NULL;
+
+#if !defined(LOW_MEMORY)
 	struct iax_frames *iax_frames;
 
 	/* Attempt to get a frame from this thread's cache */
@@ -955,6 +959,7 @@
 		}
 		AST_LIST_TRAVERSE_SAFE_END
 	}
+#endif
 
 	if (!fr) {
 		if (!(fr = ast_calloc_cache(1, sizeof(*fr) + datalen)))
@@ -975,7 +980,9 @@
 
 void iax_frame_free(struct iax_frame *fr)
 {
+#if !defined(LOW_MEMORY)
 	struct iax_frames *iax_frames;
+#endif
 
 	/* Note: does not remove from scheduler! */
 	if (fr->direction == DIRECTION_INGRESS)
@@ -986,17 +993,22 @@
 		errorf("Attempt to double free frame detected\n");
 		return;
 	}
-	fr->direction = 0;
 	ast_atomic_fetchadd_int(&frames, -1);
 
+#if !defined(LOW_MEMORY)
 	if (!(iax_frames = ast_threadstorage_get(&frame_cache, sizeof(*iax_frames)))) {
 		free(fr);
 		return;
 	}
 
+	fr->direction = 0;
 	AST_LIST_INSERT_HEAD(iax_frames, fr, list);
-}
-
+#else
+	free(fr);
+#endif
+}
+
+#if !defined(LOW_MEMORY)
 static void frame_cache_cleanup(void *data)
 {
 	struct iax_frames *frames = data;
@@ -1007,6 +1019,7 @@
 
 	free(frames);
 }
+#endif
 
 int iax_get_frames(void) { return frames; }
 int iax_get_iframes(void) { return iframes; }