[Glibc-bsd-commits] r5951 - in trunk/glibc-ports-2.23: fbtl/sysdeps/pthread fbtl/sysdeps/pthread/bits kfreebsd/fbtl
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Sun Mar 20 00:01:37 UTC 2016
Author: aurel32
Date: 2016-03-20 00:01:37 +0000 (Sun, 20 Mar 2016)
New Revision: 5951
Added:
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/stdio-lock.h
Removed:
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/bits/stdio-lock.h
Modified:
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/flockfile.c
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/ftrylockfile.c
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/funlockfile.c
trunk/glibc-ports-2.23/kfreebsd/fbtl/fork.c
Log:
Merge from upstream:
commit 81503d1e4449fdb334ad343f4ddc05891c6b4190
Author: Joseph Myers <joseph at codesourcery.com>
Date: Fri Sep 4 16:21:14 2015 +0000
Rename bits/stdio-lock.h to stdio-lock.h (bug 14912).
It was noted in
<https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the
bits/*.h naming scheme should only be used for installed headers.
This patch renames bits/stdio-lock.h to plain stdio-lock.h to follow
that convention.
Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).
Deleted: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/bits/stdio-lock.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/bits/stdio-lock.h 2016-03-19 23:45:02 UTC (rev 5950)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/bits/stdio-lock.h 2016-03-20 00:01:37 UTC (rev 5951)
@@ -1,110 +0,0 @@
-/* Thread package specific definitions of stream lock type. NPTL version.
- Copyright (C) 2000-2013 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
- <http://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_STDIO_LOCK_H
-#define _BITS_STDIO_LOCK_H 1
-
-#include <libc-lock.h>
-#include <lowlevellock.h>
-
-
-/* The locking here is very inexpensive, even for inlining. */
-#define _IO_lock_inexpensive 1
-
-typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
-
-#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
-
-#define _IO_lock_init(_name) \
- ((void) ((_name) = (_IO_lock_t) _IO_lock_initializer))
-
-#define _IO_lock_fini(_name) \
- ((void) 0)
-
-#define _IO_lock_lock(_name) \
- do { \
- void *__self = THREAD_SELF; \
- if ((_name).owner != __self) \
- { \
- lll_lock ((_name).lock, LLL_PRIVATE); \
- (_name).owner = __self; \
- } \
- ++(_name).cnt; \
- } while (0)
-
-#define _IO_lock_trylock(_name) \
- ({ \
- int __result = 0; \
- void *__self = THREAD_SELF; \
- if ((_name).owner != __self) \
- { \
- if (lll_trylock ((_name).lock) == 0) \
- { \
- (_name).owner = __self; \
- (_name).cnt = 1; \
- } \
- else \
- __result = EBUSY; \
- } \
- else \
- ++(_name).cnt; \
- __result; \
- })
-
-#define _IO_lock_unlock(_name) \
- do { \
- if (--(_name).cnt == 0) \
- { \
- (_name).owner = NULL; \
- lll_unlock ((_name).lock, LLL_PRIVATE); \
- } \
- } while (0)
-
-
-
-#define _IO_cleanup_region_start(_fct, _fp) \
- __libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp)
-#define _IO_cleanup_region_start_noarg(_fct) \
- __libc_cleanup_region_start (1, _fct, NULL)
-#define _IO_cleanup_region_end(_doit) \
- __libc_cleanup_region_end (_doit)
-
-#if defined _LIBC && IS_IN (libc)
-
-# ifdef __EXCEPTIONS
-# define _IO_acquire_lock(_fp) \
- do { \
- _IO_FILE *_IO_acquire_lock_file \
- __attribute__((cleanup (_IO_acquire_lock_fct))) \
- = (_fp); \
- _IO_flockfile (_IO_acquire_lock_file);
-# define _IO_acquire_lock_clear_flags2(_fp) \
- do { \
- _IO_FILE *_IO_acquire_lock_file \
- __attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct))) \
- = (_fp); \
- _IO_flockfile (_IO_acquire_lock_file);
-# else
-# define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
-# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
-# endif
-# define _IO_release_lock(_fp) ; } while (0)
-
-#endif
-
-#endif /* bits/stdio-lock.h */
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/flockfile.c
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/flockfile.c 2016-03-19 23:45:02 UTC (rev 5950)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/flockfile.c 2016-03-20 00:01:37 UTC (rev 5951)
@@ -19,7 +19,7 @@
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/ftrylockfile.c
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/ftrylockfile.c 2016-03-19 23:45:02 UTC (rev 5950)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/ftrylockfile.c 2016-03-20 00:01:37 UTC (rev 5951)
@@ -19,7 +19,7 @@
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
int
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/funlockfile.c
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/funlockfile.c 2016-03-19 23:45:02 UTC (rev 5950)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/funlockfile.c 2016-03-20 00:01:37 UTC (rev 5951)
@@ -19,7 +19,7 @@
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void
Copied: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/stdio-lock.h (from rev 5950, trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/bits/stdio-lock.h)
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/stdio-lock.h (rev 0)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/stdio-lock.h 2016-03-20 00:01:37 UTC (rev 5951)
@@ -0,0 +1,110 @@
+/* Thread package specific definitions of stream lock type. NPTL version.
+ Copyright (C) 2000-2013 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STDIO_LOCK_H
+#define _STDIO_LOCK_H 1
+
+#include <libc-lock.h>
+#include <lowlevellock.h>
+
+
+/* The locking here is very inexpensive, even for inlining. */
+#define _IO_lock_inexpensive 1
+
+typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
+
+#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
+
+#define _IO_lock_init(_name) \
+ ((void) ((_name) = (_IO_lock_t) _IO_lock_initializer))
+
+#define _IO_lock_fini(_name) \
+ ((void) 0)
+
+#define _IO_lock_lock(_name) \
+ do { \
+ void *__self = THREAD_SELF; \
+ if ((_name).owner != __self) \
+ { \
+ lll_lock ((_name).lock, LLL_PRIVATE); \
+ (_name).owner = __self; \
+ } \
+ ++(_name).cnt; \
+ } while (0)
+
+#define _IO_lock_trylock(_name) \
+ ({ \
+ int __result = 0; \
+ void *__self = THREAD_SELF; \
+ if ((_name).owner != __self) \
+ { \
+ if (lll_trylock ((_name).lock) == 0) \
+ { \
+ (_name).owner = __self; \
+ (_name).cnt = 1; \
+ } \
+ else \
+ __result = EBUSY; \
+ } \
+ else \
+ ++(_name).cnt; \
+ __result; \
+ })
+
+#define _IO_lock_unlock(_name) \
+ do { \
+ if (--(_name).cnt == 0) \
+ { \
+ (_name).owner = NULL; \
+ lll_unlock ((_name).lock, LLL_PRIVATE); \
+ } \
+ } while (0)
+
+
+
+#define _IO_cleanup_region_start(_fct, _fp) \
+ __libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+ __libc_cleanup_region_start (1, _fct, NULL)
+#define _IO_cleanup_region_end(_doit) \
+ __libc_cleanup_region_end (_doit)
+
+#if defined _LIBC && IS_IN (libc)
+
+# ifdef __EXCEPTIONS
+# define _IO_acquire_lock(_fp) \
+ do { \
+ _IO_FILE *_IO_acquire_lock_file \
+ __attribute__((cleanup (_IO_acquire_lock_fct))) \
+ = (_fp); \
+ _IO_flockfile (_IO_acquire_lock_file);
+# define _IO_acquire_lock_clear_flags2(_fp) \
+ do { \
+ _IO_FILE *_IO_acquire_lock_file \
+ __attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct))) \
+ = (_fp); \
+ _IO_flockfile (_IO_acquire_lock_file);
+# else
+# define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
+# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
+# endif
+# define _IO_release_lock(_fp) ; } while (0)
+
+#endif
+
+#endif /* stdio-lock.h */
Modified: trunk/glibc-ports-2.23/kfreebsd/fbtl/fork.c
===================================================================
--- trunk/glibc-ports-2.23/kfreebsd/fbtl/fork.c 2016-03-19 23:45:02 UTC (rev 5950)
+++ trunk/glibc-ports-2.23/kfreebsd/fbtl/fork.c 2016-03-20 00:01:37 UTC (rev 5951)
@@ -26,7 +26,7 @@
#include "fork.h"
#include <hp-timing.h>
#include <ldsodefs.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
#include <atomic.h>
#include <pthreadP.h>
More information about the Glibc-bsd-commits
mailing list