[PATCH, libpthread] Correct logic for PTHREAD_KEY_INVALID slots.

[Thomas Schwinge]

* sysdeps/hurd/pt-destroy-specific.c (__pthread_destroy_specific): Correct
logic for PTHREAD_KEY_INVALID slots.
* tests/test-__pthread_destroy_specific-skip.c: New file.
* tests/Makefile (CHECK_SRC): Add test-__pthread_destroy_specific-skip.c.
---

Hi!

I found this while reviewing Pino's libpthread key-reuse patch.  Correct?


Grüße,
 Thomas


---
 sysdeps/hurd/pt-destroy-specific.c           |    2 +-
 tests/Makefile                               |    2 +-
 tests/test-__pthread_destroy_specific-skip.c |   83 ++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 tests/test-__pthread_destroy_specific-skip.c

diff --git a/sysdeps/hurd/pt-destroy-specific.c 
b/sysdeps/hurd/pt-destroy-specific.c
index 23c7fbc..f7896e5 100644
--- a/sysdeps/hurd/pt-destroy-specific.c
+++ b/sysdeps/hurd/pt-destroy-specific.c
@@ -48,7 +48,7 @@ __pthread_destroy_specific (struct __pthread *thread)
          void *value;
 
          if (__pthread_key_destructors[i] == PTHREAD_KEY_INVALID)
-           break;
+           continue;
 
          value = hurd_ihash_find (thread->thread_specifics, i);
          if (value)
diff --git a/tests/Makefile b/tests/Makefile
index 9509c95..343a644 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,7 +4,7 @@ LDLIBS = -lpthread
 
 CHECK_SRC := test-1.c test-2.c test-3.c test-6.c test-7.c test-8.c     \
        test-9.c test-10.c test-11.c test-12.c test-13.c test-14.c      \
-       test-15.c test-16.c
+       test-15.c test-16.c test-__pthread_destroy_specific-skip.c
 
 CHECK_OBJS := $(addsuffix .o,$(basename $(notdir $(CHECK_SRC))))
 CHECK_PROGS := $(basename $(notdir $(CHECK_SRC))) \
diff --git a/tests/test-__pthread_destroy_specific-skip.c 
b/tests/test-__pthread_destroy_specific-skip.c
new file mode 100644
index 0000000..b2c4c0b
--- /dev/null
+++ b/tests/test-__pthread_destroy_specific-skip.c
@@ -0,0 +1,83 @@
+/* Check that __pthread_destroy_specific works correctly if it has to skip
+   unused slots.  */
+
+#define _GNU_SOURCE
+
+#include <error.h>
+#include <pthread.h>
+#include <stdio.h>
+
+
+#define N_k 42
+
+static volatile int v;
+
+static void
+d (void *x)
+{
+  int *i = (int *) x;
+
+  if (v != *i)
+    error (1, 0, "FAILED %d %d", v, *i);
+  v += 2;
+
+  printf ("%s %d\n", __FUNCTION__, *i);
+  fflush (stdout);
+}
+
+static void *
+test (void *x)
+{
+  pthread_key_t k[N_k];
+  static int k_v[N_k];
+
+  int err, i;
+
+  for (i = 0; i < N_k; i += 1)
+    {
+      err = pthread_key_create (&k[i], &d);
+      if (err != 0)
+        error (1, err, "pthread_key_create %d", i);
+    }
+
+  for (i = 0; i < N_k; i += 1)
+    {
+      k_v[i] = i;
+      err = pthread_setspecific (k[i], &k_v[i]);
+      if (err != 0)
+        error (1, err, "pthread_setspecific %d", i);
+    }
+
+  /* Delete every even key.  */
+  for (i = 0; i < N_k; i += 2)
+    {
+      err = pthread_key_delete (k[i]);
+      if (err != 0)
+        error (1, err, "pthread_key_delete %d", i);
+    }
+
+  v = 1;
+  pthread_exit (NULL);
+
+  return NULL;
+}
+
+
+int main(void)
+{
+  pthread_t tid;
+  int err;
+
+  err = pthread_create (&tid, 0, test, NULL);
+  if (err != 0)
+    error (1, err, "pthread_create");
+
+  err = pthread_join(tid, NULL);
+  if (err)
+    error (1, err, "pthread_join");
+
+  if (v != N_k + 1)
+    error (1, 0, "FAILED END %d %d", v, N_k + 1);
+
+  return 0;
+}
-- 
1.7.7