Mercurial > hg > octave-lyh > gnulib-hg
changeset 4919:759a578edd98
New module 'eealloc'.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 20 Jan 2004 13:48:29 +0000 |
parents | 7248b819ea26 |
children | 558ac8324865 |
files | ChangeLog lib/ChangeLog lib/eealloc.h m4/ChangeLog m4/eealloc.m4 modules/eealloc |
diffstat | 6 files changed, 135 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-20 Bruno Haible <bruno@clisp.org> + + * modules/eealloc: New file. + * MODULES.html.sh (func_all_modules): Add eealloc. + 2004-01-15 Paul Eggert <eggert@twinsun.com> * modules/poll: Add BUILT_SOURCES.
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-11-24 Bruno Haible <bruno@clisp.org> + + * eealloc.h: New file. + 2004-01-15 Jim Meyering <jim@meyering.net> Merge from coreutils.
new file mode 100644 --- /dev/null +++ b/lib/eealloc.h @@ -0,0 +1,68 @@ +/* Memory allocation with expensive empty allocations. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2003, + based on prior work by Jim Meyering. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _EEALLOC_H +#define _EEALLOC_H + +/* malloc() and realloc() are allowed to return NULL when asked to allocate + a memory block of 0 bytes; this is not an out-of-memory condition. + (See ISO C 99 section 7.20.3.) In some places, this is not welcome, + because it requires extra checking (so as not to confuse a zero-sized + allocation with an out-of-memory condition). This file provides + malloc()/realloc() workalikes which return non-NULL pointers for + succeeding zero-sized allocations. GNU libc already defines malloc() + and realloc() this way; on such platforms the workalikes are aliased + to the original malloc()/realloc() functions. */ + +#include <stdlib.h> + +#if MALLOC_0_IS_NONNULL +# define eemalloc malloc +#else +static inline void * +eemalloc (size_t n) +{ + /* If n is zero, allocate a 1-byte block. */ + if (n == 0) + n = 1; + return malloc (n); +} +#endif + +#if REALLOC_0_IS_NONNULL +# define eerealloc realloc +#else +static inline void * +eerealloc (void *p, size_t n) +{ + /* If n is zero, allocate or keep a 1-byte block. */ + if (n == 0) + n = 1; + return realloc (p, n); +} +#endif + +/* Maybe we should also define variants + eenmalloc (size_t n, size_t s) - behaves like eemalloc (n * s) + eezalloc (size_t n) - like eemalloc followed by memset 0 + eecalloc (size_t n, size_t s) - like eemalloc (n * s) followed by memset 0 + eenrealloc (void *p, size_t n, size_t s) - like eerealloc (p, n * s) + If this would be useful in your application. please speak up. */ + +#endif /* _EEALLOC_H */
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2003-11-24 Bruno Haible <bruno@clisp.org> + + * eealloc.m4: New file, from GNU gettext. + 2004-01-15 Paul Eggert <eggert@twinsun.com> Merge from coreutils.
new file mode 100644 --- /dev/null +++ b/m4/eealloc.m4 @@ -0,0 +1,34 @@ +# eealloc.m4 serial 1 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_EEALLOC], +[ + AC_REQUIRE([gl_EEMALLOC]) + AC_REQUIRE([gl_EEREALLOC]) + AC_REQUIRE([AC_C_INLINE]) +]) + +AC_DEFUN([gl_EEMALLOC], +[ + _AC_FUNC_MALLOC_IF( + [gl_cv_func_malloc_0_nonnull=1], + [gl_cv_func_malloc_0_nonnull=0]) + AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull, + [If malloc(0) is != NULL, define this to 1. Otherwise define this + to 0.]) +]) + +AC_DEFUN([gl_EEREALLOC], +[ + _AC_FUNC_REALLOC_IF( + [gl_cv_func_realloc_0_nonnull=1], + [gl_cv_func_realloc_0_nonnull=0]) + AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull, + [If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this + to 0.]) +])
new file mode 100644 --- /dev/null +++ b/modules/eealloc @@ -0,0 +1,20 @@ +Description: +Memory allocation with expensive empty allocations (glibc compatible). + +Files: +lib/eealloc.h +m4/eealloc.m4 + +Depends-on: + +configure.ac: +gl_EEALLOC + +Makefile.am: +EXTRA_DIST += eealloc.h + +Include: +#include <eealloc.h> + +Maintainer: +Bruno Haible