[2/2] htl: Get sem_open/sem_close/sem_unlink support [BZ #25524]
Commit Message
This just moves the existing nptl implementation to reuse as it is in
htl.
---
htl/Makefile | 4 +--
htl/semaphoreP.h | 49 ++++++++++++++++++++++++++
sysdeps/htl/sem-close.c | 31 ----------------
sysdeps/htl/sem-open.c | 31 ----------------
sysdeps/htl/sem-unlink.c | 31 ----------------
sysdeps/mach/hurd/i386/Makefile | 7 ----
{nptl => sysdeps/pthread}/sem_close.c | 0
{nptl => sysdeps/pthread}/sem_open.c | 0
{nptl => sysdeps/pthread}/sem_unlink.c | 0
9 files changed, 51 insertions(+), 102 deletions(-)
create mode 100644 htl/semaphoreP.h
delete mode 100644 sysdeps/htl/sem-close.c
delete mode 100644 sysdeps/htl/sem-open.c
delete mode 100644 sysdeps/htl/sem-unlink.c
rename {nptl => sysdeps/pthread}/sem_close.c (100%)
rename {nptl => sysdeps/pthread}/sem_open.c (100%)
rename {nptl => sysdeps/pthread}/sem_unlink.c (100%)
Comments
On 15/12/2020 22:51, Samuel Thibault wrote:
> This just moves the existing nptl implementation to reuse as it is in
> htl.
\
> diff --git a/htl/semaphoreP.h b/htl/semaphoreP.h
> new file mode 100644
> index 0000000000..22732122b0
> --- /dev/null
> +++ b/htl/semaphoreP.h
> @@ -0,0 +1,49 @@
> +/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Remove the 'Contributed by'.
> +
> + 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 <semaphore.h>
> +#include "pt-internal.h"
> +
> +#define SEM_SHM_PREFIX "sem."
> +
> +/* Keeping track of currently used mappings. */
> +struct inuse_sem
> +{
> + dev_t dev;
> + ino_t ino;
> + int refcnt;
> + sem_t *sem;
> + char name[0];
Use a C99 flexible array.
Adhemerval Zanella, le mer. 16 déc. 2020 10:32:33 -0300, a ecrit:
> On 15/12/2020 22:51, Samuel Thibault wrote:
> > diff --git a/htl/semaphoreP.h b/htl/semaphoreP.h
> > new file mode 100644
> > index 0000000000..22732122b0
> > --- /dev/null
> > +++ b/htl/semaphoreP.h
> > @@ -0,0 +1,49 @@
> > +/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
> > + This file is part of the GNU C Library.
> > + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
>
> Remove the 'Contributed by'.
>
> > +/* Keeping track of currently used mappings. */
> > +struct inuse_sem
> > +{
> > + dev_t dev;
> > + ino_t ino;
> > + int refcnt;
> > + sem_t *sem;
> > + char name[0];
>
> Use a C99 flexible array.
These were copied over from the existing files, but right, fixed so :)
Samuel
@@ -128,8 +128,8 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \
pt-getschedparam pt-setschedparam pt-setschedprio \
pt-yield \
\
- sem-close sem-destroy sem-getvalue sem-init sem-open \
- sem-post sem-timedwait sem-trywait sem-unlink \
+ sem_close sem-destroy sem-getvalue sem-init sem_open \
+ sem-post sem-timedwait sem-trywait sem_unlink \
sem-wait sem-waitfast \
\
shm-directory \
new file mode 100644
@@ -0,0 +1,49 @@
+/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+ 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 <semaphore.h>
+#include "pt-internal.h"
+
+#define SEM_SHM_PREFIX "sem."
+
+/* Keeping track of currently used mappings. */
+struct inuse_sem
+{
+ dev_t dev;
+ ino_t ino;
+ int refcnt;
+ sem_t *sem;
+ char name[0];
+};
+
+
+/* The search tree for existing mappings. */
+extern void *__sem_mappings attribute_hidden;
+
+/* Lock to protect the search tree. */
+extern int __sem_mappings_lock attribute_hidden;
+
+
+/* Comparison function for search in tree with existing mappings. */
+extern int __sem_search (const void *a, const void *b) attribute_hidden;
+
+static inline void __new_sem_open_init (struct new_sem *sem, unsigned value)
+{
+ /* This always is a shared semaphore. */
+ *sem = (struct new_sem) __SEMAPHORE_INITIALIZER (1, value);
+}
deleted file mode 100644
@@ -1,31 +0,0 @@
-/* Close a named semaphore. Generic version.
- Copyright (C) 2005-2020 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_close (sem_t *sem)
-{
- errno = EOPNOTSUPP;
- return -1;
-}
-
-strong_alias (__sem_close, sem_close);
deleted file mode 100644
@@ -1,31 +0,0 @@
-/* Open a named semaphore. Generic version.
- Copyright (C) 2005-2020 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-sem_t *
-__sem_open (const char *name, int open_flags, ...)
-{
- errno = ENOSYS;
- return SEM_FAILED;
-}
-
-strong_alias (__sem_open, sem_open);
deleted file mode 100644
@@ -1,31 +0,0 @@
-/* Unlink a named semaphore. Generic version.
- Copyright (C) 2005-2020 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 <semaphore.h>
-#include <errno.h>
-
-#include <pt-internal.h>
-
-int
-__sem_unlink (const char *name)
-{
- errno = EOPNOTSUPP;
- return -1;
-}
-
-strong_alias (__sem_unlink, sem_unlink);
@@ -129,13 +129,6 @@ test-xfail-tst-signal2 = yes
test-xfail-tst-cond24 = yes
test-xfail-tst-cond25 = yes
-# For bug 25524
-# (sem_open support)
-test-xfail-tst-sem4 = yes
-test-xfail-tst-sem7 = yes
-test-xfail-tst-sem8 = yes
-test-xfail-tst-sem9 = yes
-
# For bug 25563
# (robust support against dead threads)
test-xfail-tst-robust1 = yes
similarity index 100%
rename from nptl/sem_close.c
rename to sysdeps/pthread/sem_close.c
similarity index 100%
rename from nptl/sem_open.c
rename to sysdeps/pthread/sem_open.c
similarity index 100%
rename from nptl/sem_unlink.c
rename to sysdeps/pthread/sem_unlink.c