From: Paul Eggert <eggert@cs.ucla.edu>
To: bug-gnulib@gnu.org
Cc: Paul Eggert <eggert@cs.ucla.edu>
Subject: [PATCH 01/13] ialloc: new module
Date: Fri, 11 Jun 2021 17:25:41 -0700 [thread overview]
Message-ID: <20210612002553.1105537-1-eggert@cs.ucla.edu> (raw)
In-Reply-To: <bug-gnulib@gnu.org>
* lib/ialloc.c, lib/ialloc.h, modules/ialloc: New files.
---
ChangeLog | 3 ++
lib/ialloc.c | 3 ++
lib/ialloc.h | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
modules/ialloc | 29 ++++++++++++++++
4 files changed, 129 insertions(+)
create mode 100644 lib/ialloc.c
create mode 100644 lib/ialloc.h
create mode 100644 modules/ialloc
diff --git a/ChangeLog b/ChangeLog
index 304599f81..dd9aa5015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2021-06-11 Paul Eggert <eggert@cs.ucla.edu>
+ ialloc: new module
+ * lib/ialloc.c, lib/ialloc.h, modules/ialloc: New files.
+
exclude: improve wide-character hashing
* lib/exclude.c (string_hasher_ci): Take the modulo at the end
rather than each time a wide character is retrieved; this should
diff --git a/lib/ialloc.c b/lib/ialloc.c
new file mode 100644
index 000000000..9eff29035
--- /dev/null
+++ b/lib/ialloc.c
@@ -0,0 +1,3 @@
+#include <config.h>
+#define IALLOC_INLINE _GL_EXTERN_INLINE
+#include "ialloc.h"
diff --git a/lib/ialloc.h b/lib/ialloc.h
new file mode 100644
index 000000000..e243c928c
--- /dev/null
+++ b/lib/ialloc.h
@@ -0,0 +1,94 @@
+/* ialloc.h -- malloc with idx_t rather than size_t
+
+ Copyright 2021 Free Software Foundation, Inc.
+
+ 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 3 of the License, 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, see <https://www.gnu.org/licenses/>. */
+
+#ifndef IALLOC_H_
+#define IALLOC_H_
+
+#include "idx.h"
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef IALLOC_INLINE
+# define IALLOC_INLINE _GL_INLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+IALLOC_INLINE void * _GL_ATTRIBUTE_COLD
+_gl_alloc_nomem (void)
+{
+ errno = ENOMEM;
+ return NULL;
+}
+
+IALLOC_INLINE void *
+imalloc (idx_t s)
+{
+ return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem ();
+}
+
+IALLOC_INLINE void *
+irealloc (void *p, idx_t s)
+{
+ /* Work around GNU realloc glitch by treating a zero size as if it
+ were 1, so that returning NULL is equivalent to failing. */
+ return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem ();
+}
+
+IALLOC_INLINE void *
+icalloc (idx_t n, idx_t s)
+{
+ if (SIZE_MAX < n)
+ {
+ if (s != 0)
+ return _gl_alloc_nomem ();
+ n = 0;
+ }
+ if (SIZE_MAX < s)
+ {
+ if (n != 0)
+ return _gl_alloc_nomem ();
+ s = 0;
+ }
+ return calloc (n, s);
+}
+
+IALLOC_INLINE void *
+ireallocarray (void *p, idx_t n, idx_t s)
+{
+ /* Work around GNU reallocarray glitch by treating a zero size as if
+ it were 1, so that returning NULL is equivalent to failing. */
+ if (n == 0 || s == 0)
+ n = s = 1;
+ return (n <= SIZE_MAX && s <= SIZE_MAX
+ ? reallocarray (p, n, s)
+ : _gl_alloc_nomem ());
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules/ialloc b/modules/ialloc
new file mode 100644
index 000000000..3bf377a62
--- /dev/null
+++ b/modules/ialloc
@@ -0,0 +1,29 @@
+Description:
+Memory allocation using idx_t instead of size_t
+
+Files:
+lib/ialloc.c
+lib/ialloc.h
+
+Depends-on:
+calloc-gnu
+extern-inline
+idx
+malloc-gnu
+realloc-gnu
+reallocarray
+stdint
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += ialloc.c
+
+Include:
+"ialloc.h"
+
+License:
+LGPL
+
+Maintainer:
+all
--
2.30.2
next reply other threads:[~2021-06-12 0:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 0:25 Paul Eggert [this message]
2021-06-12 0:25 ` [PATCH 02/13] xalloc: new idx_t-based allocators Paul Eggert
2021-06-12 0:25 ` [PATCH 03/13] dirname: prefer idx_t for some indexes Paul Eggert
2021-06-12 0:25 ` [PATCH 04/13] dfa: prefer idx_t for indexes Paul Eggert
2021-06-12 0:25 ` [PATCH 05/13] exclude: prefer idx_t for most indexes Paul Eggert
2021-06-12 0:25 ` [PATCH 06/13] getusershell: prefer idx_t for indexes Paul Eggert
2021-06-12 0:25 ` [PATCH 07/13] linebuffer: " Paul Eggert
2021-06-12 0:25 ` [PATCH 08/13] readtokens: " Paul Eggert
2021-06-12 0:25 ` [PATCH 09/13] readutmp: " Paul Eggert
2021-06-12 0:25 ` [PATCH 10/13] savedir: " Paul Eggert
2021-06-12 0:25 ` [PATCH 11/13] stack: " Paul Eggert
2021-06-13 10:19 ` Bruno Haible
2021-06-13 17:47 ` Paul Eggert
2021-06-12 0:25 ` [PATCH 12/13] userspec: " Paul Eggert
2021-06-12 0:25 ` [PATCH 13/13] xgethostname: " Paul Eggert
2021-06-13 10:05 ` [PATCH 01/13] ialloc: new module Bruno Haible
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210612002553.1105537-1-eggert@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=bug-gnulib@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).