diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:17:01 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:17:01 +0000 |
commit | e3526e1ab7001b5e00f3f9e933d7ab60b6ccb0d9 (patch) | |
tree | 288a54d872a7b6ec21d06ecdc22984c6aa0f12a3 | |
parent | c623542335b6131106457a10436197f4e63a3830 (diff) |
don't do frame header caching in the core if LOW_MEMORY is defined
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@49461 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/frame.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/main/frame.c b/main/frame.c index 078713975..0cf11981f 100644 --- a/main/frame.c +++ b/main/frame.c @@ -49,6 +49,7 @@ static int headers; 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_frame_cache { struct ast_frames list; size_t size; }; +#endif #define SMOOTHER_SIZE 8000 @@ -284,6 +286,8 @@ void ast_smoother_free(struct ast_smoother *s) 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)))) { @@ -296,6 +300,7 @@ static struct ast_frame *ast_frame_header_new(void) return f; } } +#endif if (!(f = ast_calloc_cache(1, sizeof(*f)))) return NULL; @@ -311,6 +316,7 @@ static struct ast_frame *ast_frame_header_new(void) return f; } +#if !defined(LOW_MEMORY) static void frame_cache_cleanup(void *data) { struct ast_frame_cache *frames = data; @@ -321,12 +327,14 @@ static void frame_cache_cleanup(void *data) 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... */ @@ -339,6 +347,7 @@ void ast_frame_free(struct ast_frame *fr, int cache) return; } } +#endif if (fr->mallocd & AST_MALLOCD_DATA) { if (fr->data) @@ -422,11 +431,14 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr) 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; /* If we have a source, add space for it */ @@ -439,6 +451,7 @@ struct ast_frame *ast_frdup(const struct ast_frame *f) 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) { @@ -453,6 +466,8 @@ struct ast_frame *ast_frdup(const struct ast_frame *f) } AST_LIST_TRAVERSE_SAFE_END } +#endif + if (!buf) { if (!(buf = ast_calloc_cache(1, len))) return NULL; |