From faa970ad2f949a2ec70971337c4aba7f9fe736f7 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 02:16:26 +0100 Subject: Move bits/barrier.h to bits/types/struct___pthread_barrier.h * sysdeps/pthread/bits/barrier.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_barrier.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. --- Makefile | 2 +- sysdeps/generic/pthread.h | 2 +- sysdeps/pthread/bits/barrier.h | 38 ---------------------- sysdeps/pthread/bits/pthreadtypes.h | 2 +- .../pthread/bits/types/struct___pthread_barrier.h | 38 ++++++++++++++++++++++ 5 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 sysdeps/pthread/bits/barrier.h create mode 100644 sysdeps/pthread/bits/types/struct___pthread_barrier.h diff --git a/Makefile b/Makefile index bb6fe4b..0cc06d2 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ headers := \ bits/cancelation.h \ bits/thread-attr.h \ bits/types/struct___pthread_barrierattr.h \ - bits/barrier.h \ + bits/types/struct___pthread_barrier.h \ bits/thread-specific.h \ bits/once.h \ bits/mutex-attr.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 00a947e..ec7b50f 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -750,7 +750,7 @@ extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr, /* Barriers. */ -#include +#include /* Returned by pthread_barrier_wait to exactly one thread each time a barrier is passed. */ diff --git a/sysdeps/pthread/bits/barrier.h b/sysdeps/pthread/bits/barrier.h deleted file mode 100644 index 2ea8c15..0000000 --- a/sysdeps/pthread/bits/barrier.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Thread barrier attribute type. Generic version. - Copyright (C) 2002-2018 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#ifndef _BITS_BARRIER_H -#define _BITS_BARRIER_H 1 - -#include - -/* This structure describes the attributes of a POSIX barrier. */ -struct __pthread_barrier -{ - __pthread_spinlock_t __lock; - struct __pthread *__queue; /* List of waiters. */ - unsigned __pending; /* Number of that still need to wait on - barrier. */ - unsigned __count; /* Number of threads that must wait before - barrier is passed. */ - struct __pthread_barrierattr *__attr; - void *__data; -}; - - -#endif /* bits/barrier.h */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 4516a17..c34e2d9 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -117,7 +117,7 @@ typedef struct __pthread_rwlock pthread_rwlock_t; #include typedef struct __pthread_barrierattr pthread_barrierattr_t; -#include +#include typedef struct __pthread_barrier pthread_barrier_t; #endif /* __USE_XOPEN2K */ diff --git a/sysdeps/pthread/bits/types/struct___pthread_barrier.h b/sysdeps/pthread/bits/types/struct___pthread_barrier.h new file mode 100644 index 0000000..a4c0f61 --- /dev/null +++ b/sysdeps/pthread/bits/types/struct___pthread_barrier.h @@ -0,0 +1,38 @@ +/* Thread barrier attribute type. Generic version. + Copyright (C) 2002-2018 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#ifndef _BITS_TYPES_STRUCT___PTHREAD_BARRIER_H +#define _BITS_TYPES_STRUCT___PTHREAD_BARRIER_H 1 + +#include + +/* This structure describes the attributes of a POSIX barrier. */ +struct __pthread_barrier +{ + __pthread_spinlock_t __lock; + struct __pthread *__queue; /* List of waiters. */ + unsigned __pending; /* Number of that still need to wait on + barrier. */ + unsigned __count; /* Number of threads that must wait before + barrier is passed. */ + struct __pthread_barrierattr *__attr; + void *__data; +}; + + +#endif /* bits/types/struct___pthread_barrier.h */ -- cgit v1.2.3