X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fmem.c;h=bf1a542db8fceb223e8fe6ec5ebd8d08fdfd00de;hb=14f063d294a18a31928d2167a66b1087910e14c8;hp=c95892b361749eb8748d0c68883875be8bc7721d;hpb=d6def91a3bcd08af9baf162577954c92cf4e8886;p=ffmpeg diff --git a/libavutil/mem.c b/libavutil/mem.c index c95892b3617..bf1a542db8f 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -1,80 +1,105 @@ /* * default memory allocator for libavutil - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file mem.c - * default memory allocator for libavutil. + * @file + * default memory allocator for libavutil */ -#include "common.h" +#include "config.h" -/* here we can use OS dependent allocation functions */ -#undef malloc +#include +#include +#include +#if HAVE_MALLOC_H +#include +#endif + +#include "avutil.h" +#include "mem.h" + +/* here we can use OS-dependent allocation functions */ #undef free +#undef malloc #undef realloc -#ifdef HAVE_MALLOC_H -#include -#endif +#ifdef MALLOC_PREFIX + +#define malloc AV_JOIN(MALLOC_PREFIX, malloc) +#define memalign AV_JOIN(MALLOC_PREFIX, memalign) +#define posix_memalign AV_JOIN(MALLOC_PREFIX, posix_memalign) +#define realloc AV_JOIN(MALLOC_PREFIX, realloc) +#define free AV_JOIN(MALLOC_PREFIX, free) + +void *malloc(size_t size); +void *memalign(size_t align, size_t size); +int posix_memalign(void **ptr, size_t align, size_t size); +void *realloc(void *ptr, size_t size); +void free(void *ptr); -/* you can redefine av_malloc and av_free in your project to use your +#endif /* MALLOC_PREFIX */ + +/* You can redefine av_malloc and av_free in your project to use your memory allocator. You do not need to suppress this file because the - linker will do it automatically */ + linker will do it automatically. */ -void *av_malloc(unsigned int size) +void *av_malloc(size_t size) { - void *ptr; -#ifdef CONFIG_MEMALIGN_HACK + void *ptr = NULL; +#if CONFIG_MEMALIGN_HACK long diff; #endif + assert(size); + /* let's disallow possible ambiguous cases */ - if(size > (INT_MAX-16) ) + if (size > (INT_MAX-32) || !size) return NULL; -#ifdef CONFIG_MEMALIGN_HACK - ptr = malloc(size+16); +#if CONFIG_MEMALIGN_HACK + ptr = malloc(size+32); if(!ptr) return ptr; - diff= ((-(long)ptr - 1)&15) + 1; - ptr += diff; + diff= ((-(long)ptr - 1)&31) + 1; + ptr = (char*)ptr + diff; ((char*)ptr)[-1]= diff; -#elif defined (HAVE_MEMALIGN) - ptr = memalign(16,size); +#elif HAVE_POSIX_MEMALIGN + if (posix_memalign(&ptr,32,size)) + ptr = NULL; +#elif HAVE_MEMALIGN + ptr = memalign(32,size); /* Why 64? Indeed, we should align it: on 4 for 386 on 16 for 486 - on 32 for 586, PPro - k6-III + on 32 for 586, PPro - K6-III on 64 for K7 (maybe for P3 too). Because L1 and L2 caches are aligned on those values. But I don't want to code such logic here! */ - /* Why 16? - because some cpus need alignment, for example SSE2 on P4, & most RISC cpus - it will just trigger an exception and the unaligned load will be done in the - exception handler or it will just segfault (SSE2 on P4) - Why not larger? because i didnt see a difference in benchmarks ... + /* Why 32? + For AVX ASM. SSE / NEON needs only 16. + Why not larger? Because I did not see a difference in benchmarks ... */ - /* benchmarks with p3 + /* benchmarks with P3 memalign(64)+1 3071,3051,3032 memalign(64)+2 3051,3032,3041 memalign(64)+4 2911,2896,2915 @@ -83,7 +108,7 @@ void *av_malloc(unsigned int size) memalign(64)+32 2546,2545,2571 memalign(64)+64 2570,2533,2558 - btw, malloc seems to do 8 byte alignment by default here + BTW, malloc seems to do 8-byte alignment by default here. */ #else ptr = malloc(size); @@ -91,9 +116,9 @@ void *av_malloc(unsigned int size) return ptr; } -void *av_realloc(void *ptr, unsigned int size) +void *av_realloc(void *ptr, size_t size) { -#ifdef CONFIG_MEMALIGN_HACK +#if CONFIG_MEMALIGN_HACK int diff; #endif @@ -101,36 +126,26 @@ void *av_realloc(void *ptr, unsigned int size) if(size > (INT_MAX-16) ) return NULL; -#ifdef CONFIG_MEMALIGN_HACK +#if CONFIG_MEMALIGN_HACK //FIXME this isn't aligned correctly, though it probably isn't needed if(!ptr) return av_malloc(size); diff= ((char*)ptr)[-1]; - return realloc(ptr - diff, size + diff) + diff; + return (char*)realloc((char*)ptr - diff, size + diff) + diff; #else return realloc(ptr, size); #endif } -/** - * Free memory which has been allocated with av_malloc(z)() or av_realloc(). - * NOTE: ptr = NULL is explicetly allowed - * Note2: it is recommended that you use av_freep() instead - */ void av_free(void *ptr) { - /* XXX: this test should not be needed on most libcs */ +#if CONFIG_MEMALIGN_HACK if (ptr) -#ifdef CONFIG_MEMALIGN_HACK - free(ptr - ((char*)ptr)[-1]); + free((char*)ptr - ((char*)ptr)[-1]); #else - free(ptr); + free(ptr); #endif } -/** - * Frees memory and sets the pointer to NULL. - * @param arg pointer to the pointer which should be freed - */ void av_freep(void *arg) { void **ptr= (void**)arg; @@ -138,11 +153,9 @@ void av_freep(void *arg) *ptr = NULL; } -void *av_mallocz(unsigned int size) +void *av_mallocz(size_t size) { - void *ptr; - - ptr = av_malloc(size); + void *ptr = av_malloc(size); if (ptr) memset(ptr, 0, size); return ptr; @@ -150,12 +163,12 @@ void *av_mallocz(unsigned int size) char *av_strdup(const char *s) { - char *ptr; - int len; - len = strlen(s) + 1; - ptr = av_malloc(len); - if (ptr) - memcpy(ptr, s, len); + char *ptr= NULL; + if(s){ + int len = strlen(s) + 1; + ptr = av_malloc(len); + if (ptr) + memcpy(ptr, s, len); + } return ptr; } -