In case we have some processing threads that free more frames than they allocate,

do not let the frame cache grow forever.

(closes issue #13160)
Reported by: tavius
Tested by: tavius, russell

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134814 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index f9c3714dbe36fb09ad200fe783a35cce6a04ac08..67bffa897f58c1c8fe4e5d0fb6cf270a43c636f5 100644 (file)
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -58,7 +58,14 @@ AST_THREADSTORAGE_CUSTOM(frame_cache, frame_cache_init, frame_cache_cleanup);
 
 /*! \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);
+AST_LIST_HEAD_NOLOCK(iax_frame_list, iax_frame);
+
+struct iax_frames {
+       struct iax_frame_list list;
+       size_t size;
+};
+
+#define FRAME_CACHE_MAX_SIZE   20
 #endif
 
 static void internaloutput(const char *str)
@@ -957,10 +964,11 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab
 
        /* Attempt to get a frame from this thread's cache */
        if ((iax_frames = ast_threadstorage_get(&frame_cache, sizeof(*iax_frames)))) {
-               AST_LIST_TRAVERSE_SAFE_BEGIN(iax_frames, fr, list) {
+               AST_LIST_TRAVERSE_SAFE_BEGIN(&iax_frames->list, fr, list) {
                        if (fr->afdatalen >= datalen) {
                                size_t afdatalen = fr->afdatalen;
-                               AST_LIST_REMOVE_CURRENT(iax_frames, list);
+                               AST_LIST_REMOVE_CURRENT(&iax_frames->list, list);
+                               iax_frames->size--;
                                memset(fr, 0, sizeof(*fr));
                                fr->afdatalen = afdatalen;
                                break;
@@ -1017,11 +1025,14 @@ void iax_frame_free(struct iax_frame *fr)
                return;
        }
 
-       fr->direction = 0;
-       AST_LIST_INSERT_HEAD(iax_frames, fr, list);
-#else
-       free(fr);
+       if (iax_frames->size < FRAME_CACHE_MAX_SIZE) {
+               fr->direction = 0;
+               AST_LIST_INSERT_HEAD(&iax_frames->list, fr, list);
+               iax_frames->size++;
+               return;
+       }
 #endif
+       free(fr);
 }
 
 #if !defined(LOW_MEMORY)
@@ -1030,7 +1041,7 @@ static void frame_cache_cleanup(void *data)
        struct iax_frames *frames = data;
        struct iax_frame *cur;
 
-       while ((cur = AST_LIST_REMOVE_HEAD(frames, list)))
+       while ((cur = AST_LIST_REMOVE_HEAD(&frames->list, list)))
                free(cur);
 
        free(frames);