[v2,2/6] elf: Add tests for the dl hash funcs (_dl_new_hash and _dl_elf_hash)
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
If we want to further optimize the functions tests are needed.
---
elf/Makefile | 1 +
elf/tst-dl-hash.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 148 insertions(+)
create mode 100644 elf/tst-dl-hash.c
Comments
* Noah Goldstein via Libc-alpha:
> +static int
> +do_fill_test (size_t len, int fill, const char *name, hash_f testf,
> + hash_f expecf)
> +{
> + uint32_t expec, res;
> + char buf[len + 1];
> + memset (buf, fill, len);
> + buf[len] = '\0';
> +
> + expec = expecf (buf);
> + res = testf (buf);
> + if (expec != res)
> + {
> + printf ("FAIL: fill(%d) %s(%lu), %x != %x\n", fill, name, len, expec,
> + res);
> + return 1;
> + }
> +
> + return 0;
> +}
Same issue with %lu and %zu here.
Thanks,
Florian
On Mon, Apr 25, 2022 at 10:39 AM Florian Weimer <fweimer@redhat.com> wrote:
>
> * Noah Goldstein via Libc-alpha:
>
> > +static int
> > +do_fill_test (size_t len, int fill, const char *name, hash_f testf,
> > + hash_f expecf)
> > +{
> > + uint32_t expec, res;
> > + char buf[len + 1];
> > + memset (buf, fill, len);
> > + buf[len] = '\0';
> > +
> > + expec = expecf (buf);
> > + res = testf (buf);
> > + if (expec != res)
> > + {
> > + printf ("FAIL: fill(%d) %s(%lu), %x != %x\n", fill, name, len, expec,
> > + res);
> > + return 1;
> > + }
> > +
> > + return 0;
> > +}
>
> Same issue with %lu and %zu here.
Fixed in v3.
>
> Thanks,
> Florian
>
@@ -309,6 +309,7 @@ tests := \
tst-array4 \
tst-array5 \
tst-auxv \
+ tst-dl-hash \
tst-leaks1 \
tst-stringtable \
tst-tls9 \
new file mode 100644
@@ -0,0 +1,147 @@
+/* Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library 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.
+
+ The GNU C Library 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 the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+/* Simple implementation of ELF ABI hash function. */
+
+#include <dl-hash.h>
+#include <dl-new-hash.h>
+#include <support/support.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef unsigned int (*hash_f) (const char *);
+
+static unsigned int
+simple_dl_new_hash (const char *s)
+{
+ uint32_t h = 5381;
+ for (unsigned char c = *s; c != '\0'; c = *++s)
+ h = h * 33 + c;
+ return h;
+}
+
+static unsigned int
+simple_dl_elf_hash (const char *name_arg)
+{
+ unsigned long int hash = 0;
+ for (unsigned char c = *name_arg; c != '\0'; c = *(++name_arg))
+ {
+ unsigned long int hi;
+ hash = (hash << 4) + c;
+ hi = hash & 0xf0000000;
+ hash ^= hi >> 24;
+ hash &= 0x0fffffff;
+ }
+ return hash;
+}
+
+static int
+do_fill_test (size_t len, int fill, const char *name, hash_f testf,
+ hash_f expecf)
+{
+ uint32_t expec, res;
+ char buf[len + 1];
+ memset (buf, fill, len);
+ buf[len] = '\0';
+
+ expec = expecf (buf);
+ res = testf (buf);
+ if (expec != res)
+ {
+ printf ("FAIL: fill(%d) %s(%lu), %x != %x\n", fill, name, len, expec,
+ res);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int
+do_fill_tests (size_t len, int fill)
+{
+ if (do_fill_test (len, fill, "dl_new_hash", &_dl_new_hash,
+ &simple_dl_new_hash))
+ {
+ return 1;
+ }
+ return do_fill_test (len, fill, "dl_elf_hash", &_dl_elf_hash,
+ &simple_dl_elf_hash);
+}
+
+static int
+do_rand_test (size_t len, const char *name, hash_f testf, hash_f expecf)
+{
+ uint32_t expec, res;
+ size_t i;
+ char buf[len + 1];
+ char v;
+ for (i = 0; i < len; ++i)
+ {
+ v = random ();
+ if (v == 0)
+ {
+ v = 1;
+ }
+ buf[i] = v;
+ }
+ buf[len] = '\0';
+
+ expec = expecf (buf);
+ res = testf (buf);
+ if (expec != res)
+ {
+ printf ("FAIL: random %s(%lu), %x != %x\n", name, len, expec, res);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int
+do_rand_tests (size_t len)
+{
+ if (do_rand_test (len, "dl_new_hash", &_dl_new_hash, &simple_dl_new_hash))
+ {
+ return 1;
+ }
+ return do_rand_test (len, "dl_elf_hash", &_dl_elf_hash, &simple_dl_elf_hash);
+}
+
+static int
+do_test (void)
+{
+ size_t i, j;
+ for (i = 0; i < 100; ++i)
+ {
+ for (j = 0; j < 8192; ++j)
+ {
+ if (do_rand_tests (i))
+ {
+ return 1;
+ }
+
+ if (do_fill_tests (i, -1) || do_fill_tests (i, 1)
+ || do_fill_tests (i, 0x80) || do_fill_tests (i, 0x88))
+ {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+#include <support/test-driver.c>