diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-04 18:19:55 +0000 |
commit | f409b5bba7f5dd37304c07d276173995b755729c (patch) | |
tree | ebbb827c5e0e7f2873b53158deb5706275f5eeba | |
parent | d8c8b23c1a8dc24b755e69920fee884a59f4389f (diff) |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49463 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/iax2-parser.c | 2 | ||||
-rw-r--r-- | codecs/Makefile | 2 | ||||
-rw-r--r-- | main/frame.c | 17 |
3 files changed, 18 insertions, 3 deletions
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index a4a81e20c..14cac4836 100644 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -55,11 +55,11 @@ 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. */ AST_LIST_HEAD_NOLOCK(iax_frames, iax_frame); +#endif static void internaloutput(const char *str) { diff --git a/codecs/Makefile b/codecs/Makefile index df527ff7c..776f8747f 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -31,7 +31,7 @@ all: _all 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 diff --git a/main/frame.c b/main/frame.c index ba796d174..f8935db5c 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 @@ -288,6 +290,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)))) { @@ -300,6 +304,7 @@ static struct ast_frame *ast_frame_header_new(void) return f; } } +#endif if (!(f = ast_calloc_cache(1, sizeof(*f)))) return NULL; @@ -315,6 +320,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; @@ -325,12 +331,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... */ @@ -343,6 +351,7 @@ void ast_frame_free(struct ast_frame *fr, int cache) return; } } +#endif if (fr->mallocd & AST_MALLOCD_DATA) { if (fr->data) @@ -426,11 +435,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 */ @@ -443,6 +455,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) { @@ -457,6 +470,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; |