[v9,3/6] nss: Add tests for the nss_hash in nss_hash.h
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 function tests are needed.
---
nss/Makefile | 1 +
nss/tst-nss-hash.c | 105 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+)
create mode 100644 nss/tst-nss-hash.c
Comments
On 17/05/2022 02:00, Noah Goldstein via Libc-alpha wrote:
> If we want to further optimize the function tests are needed.
> ---
> nss/Makefile | 1 +
> nss/tst-nss-hash.c | 105 +++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 106 insertions(+)
> create mode 100644 nss/tst-nss-hash.c
>
> diff --git a/nss/Makefile b/nss/Makefile
> index d8b06b44fb..a978e3927a 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -62,6 +62,7 @@ tests := \
> test-digits-dots \
> test-netdb \
> tst-nss-getpwent \
> + tst-nss-hash \
> tst-nss-test1 \
> tst-nss-test2 \
> tst-nss-test4 \
> diff --git a/nss/tst-nss-hash.c b/nss/tst-nss-hash.c
> new file mode 100644
> index 0000000000..6bb2ce06ab
> --- /dev/null
> +++ b/nss/tst-nss-hash.c
> @@ -0,0 +1,105 @@
> +/* Test __nss_hash
> + Copyright (C) 2017-2022 Free Software Foundation, Inc.
New file, so only 2022?
> + 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/>. */
> +
> +#include <support/support.h>
> +#include <support/check.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <stdlib.h>
> +#include <nss.h>
> +
> +uint32_t __nss_hash (const void *__key, size_t __length);
> +
> +/* Simplist implementation of __nss_hash. */
> +static uint32_t
> +simple_nss_hash (const void *keyarg, size_t len)
> +{
> + const unsigned char *key;
> + size_t i;
> + uint32_t h = 0;
> + key = keyarg;
> +
> + for (i = 0; i < len; ++i)
> + {
> + h = *key++ + 65599 * h;
> + }
> + return h;
> +}
Same as dl-hash, it may make sense to maintain this in elf/nss-hash.c:
#ifdef __nss_hash
/* Describe the reference macro */
static uint32_t
__nss_hash (const void *keyarg, size_t len)
{
const unsigned char *key;
size_t i;
uint32_t h = 0;
key = keyarg;
for (i = 0; i < len; ++i)
{
h = *key++ + 65599 * h;
}
return h;
}
#else
static uint32_t
__nss_hash (const void *keyarg, size_t len)
{
... the current implementation...
}
#endif
It can then be included like so:
#define __nss_hash simple_nss_hash
#include "nss_hash.c"
> +
> +static int
> +do_fill_tests (size_t len, int fill)
> +{
> + uint32_t expec, res;
> + char buf[len];
> + memset (buf, fill, len);
> +
> + expec = simple_nss_hash (buf, len);
> + res = __nss_hash (buf, len);
> + if (expec != res)
> + {
Redundant paranthesis.
> + FAIL_EXIT1 ("FAIL: fill(%d) (%zu), %x != %x\n", fill, len, expec, res);
> + }
> +
> + return 0;
> +}
> +
> +static int
> +do_rand_tests (size_t len)
> +{
> + uint32_t expec, res;
> + size_t i;
> + char buf[len];
> + for (i = 0; i < len; ++i)
> + {
Redundant paranthesis.
> + buf[i] = random ();
> + }
> +
> + expec = simple_nss_hash (buf, len);
> + res = __nss_hash (buf, len);
> + if (expec != res)
> + {
> + printf ("FAIL: random (%zu), %x != %x\n", len, expec, res);
> + return 1;
> + }
> +
> + return 0;
> +}
> +
> +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))
> + {
Redundant paranthesis.
> + return 1;
> + }
> + if (do_fill_tests (i, -1) || do_fill_tests (i, 1)
> + || do_fill_tests (i, 0x80) || do_fill_tests (i, 0x88))
> + {
Redundant paranthesis.
> + return 1;
> + }
> + }
> + }
> + return 0;
> +}
> +
> +#include <support/test-driver.c>
On Mon, May 16, 2022 at 11:32 PM Siddhesh Poyarekar <siddhesh@gotplt.org> wrote:
>
> On 17/05/2022 02:00, Noah Goldstein via Libc-alpha wrote:
> > If we want to further optimize the function tests are needed.
> > ---
> > nss/Makefile | 1 +
> > nss/tst-nss-hash.c | 105 +++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 106 insertions(+)
> > create mode 100644 nss/tst-nss-hash.c
> >
> > diff --git a/nss/Makefile b/nss/Makefile
> > index d8b06b44fb..a978e3927a 100644
> > --- a/nss/Makefile
> > +++ b/nss/Makefile
> > @@ -62,6 +62,7 @@ tests := \
> > test-digits-dots \
> > test-netdb \
> > tst-nss-getpwent \
> > + tst-nss-hash \
> > tst-nss-test1 \
> > tst-nss-test2 \
> > tst-nss-test4 \
> > diff --git a/nss/tst-nss-hash.c b/nss/tst-nss-hash.c
> > new file mode 100644
> > index 0000000000..6bb2ce06ab
> > --- /dev/null
> > +++ b/nss/tst-nss-hash.c
> > @@ -0,0 +1,105 @@
> > +/* Test __nss_hash
> > + Copyright (C) 2017-2022 Free Software Foundation, Inc.
>
> New file, so only 2022?
Fixed in V10.
>
> > + 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/>. */
> > +
> > +#include <support/support.h>
> > +#include <support/check.h>
> > +#include <stdio.h>
> > +#include <string.h>
> > +#include <stdlib.h>
> > +#include <nss.h>
> > +
> > +uint32_t __nss_hash (const void *__key, size_t __length);
> > +
> > +/* Simplist implementation of __nss_hash. */
> > +static uint32_t
> > +simple_nss_hash (const void *keyarg, size_t len)
> > +{
> > + const unsigned char *key;
> > + size_t i;
> > + uint32_t h = 0;
> > + key = keyarg;
> > +
> > + for (i = 0; i < len; ++i)
> > + {
> > + h = *key++ + 65599 * h;
> > + }
> > + return h;
> > +}
>
> Same as dl-hash, it may make sense to maintain this in elf/nss-hash.c:
Done in V10.
>
> #ifdef __nss_hash
> /* Describe the reference macro */
> static uint32_t
> __nss_hash (const void *keyarg, size_t len)
> {
> const unsigned char *key;
> size_t i;
> uint32_t h = 0;
> key = keyarg;
>
> for (i = 0; i < len; ++i)
> {
> h = *key++ + 65599 * h;
> }
> return h;
> }
> #else
> static uint32_t
> __nss_hash (const void *keyarg, size_t len)
> {
> ... the current implementation...
> }
> #endif
>
> It can then be included like so:
>
> #define __nss_hash simple_nss_hash
> #include "nss_hash.c"
>
> > +
> > +static int
> > +do_fill_tests (size_t len, int fill)
> > +{
> > + uint32_t expec, res;
> > + char buf[len];
> > + memset (buf, fill, len);
> > +
> > + expec = simple_nss_hash (buf, len);
> > + res = __nss_hash (buf, len);
> > + if (expec != res)
> > + {
>
> Redundant paranthesis.
Fixed in V10.
>
> > + FAIL_EXIT1 ("FAIL: fill(%d) (%zu), %x != %x\n", fill, len, expec, res);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int
> > +do_rand_tests (size_t len)
> > +{
> > + uint32_t expec, res;
> > + size_t i;
> > + char buf[len];
> > + for (i = 0; i < len; ++i)
> > + {
>
> Redundant paranthesis.
Fixed in V10.
>
> > + buf[i] = random ();
> > + }
> > +
> > + expec = simple_nss_hash (buf, len);
> > + res = __nss_hash (buf, len);
> > + if (expec != res)
> > + {
> > + printf ("FAIL: random (%zu), %x != %x\n", len, expec, res);
> > + return 1;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +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))
> > + {
>
> Redundant paranthesis.
Fixed in V10.
>
> > + return 1;
> > + }
> > + if (do_fill_tests (i, -1) || do_fill_tests (i, 1)
> > + || do_fill_tests (i, 0x80) || do_fill_tests (i, 0x88))
> > + {
>
> Redundant paranthesis.
>
> > + return 1;
> > + }
> > + }
> > + }
> > + return 0;
> > +}
> > +
> > +#include <support/test-driver.c>
>
@@ -62,6 +62,7 @@ tests := \
test-digits-dots \
test-netdb \
tst-nss-getpwent \
+ tst-nss-hash \
tst-nss-test1 \
tst-nss-test2 \
tst-nss-test4 \
new file mode 100644
@@ -0,0 +1,105 @@
+/* Test __nss_hash
+ Copyright (C) 2017-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/>. */
+
+#include <support/support.h>
+#include <support/check.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <nss.h>
+
+uint32_t __nss_hash (const void *__key, size_t __length);
+
+/* Simplist implementation of __nss_hash. */
+static uint32_t
+simple_nss_hash (const void *keyarg, size_t len)
+{
+ const unsigned char *key;
+ size_t i;
+ uint32_t h = 0;
+ key = keyarg;
+
+ for (i = 0; i < len; ++i)
+ {
+ h = *key++ + 65599 * h;
+ }
+ return h;
+}
+
+static int
+do_fill_tests (size_t len, int fill)
+{
+ uint32_t expec, res;
+ char buf[len];
+ memset (buf, fill, len);
+
+ expec = simple_nss_hash (buf, len);
+ res = __nss_hash (buf, len);
+ if (expec != res)
+ {
+ FAIL_EXIT1 ("FAIL: fill(%d) (%zu), %x != %x\n", fill, len, expec, res);
+ }
+
+ return 0;
+}
+
+static int
+do_rand_tests (size_t len)
+{
+ uint32_t expec, res;
+ size_t i;
+ char buf[len];
+ for (i = 0; i < len; ++i)
+ {
+ buf[i] = random ();
+ }
+
+ expec = simple_nss_hash (buf, len);
+ res = __nss_hash (buf, len);
+ if (expec != res)
+ {
+ printf ("FAIL: random (%zu), %x != %x\n", len, expec, res);
+ return 1;
+ }
+
+ return 0;
+}
+
+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>