This is the mail archive of the libc-ports@sources.redhat.com mailing list for the libc-ports project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [linux-generic] provide not-cancel.h


On 1/30/2012 6:25 PM, Roland McGrath wrote:
> Most of the file is an unmodified copy.  So, instead, #include the other
> file, then just #undef and re-#define the open_* macros.

Hah, good idea!  I'm so used to seeing the code duplication throughout the
tree it didn't occur to me that it would be helpful to try to be smart
about it :-)  Here's the revised commit.

Add sysdeps/unix/sysv/linux/generic/not-cancel.h to override standard
Linux version with openat().

---
 ChangeLog.linux-generic                      |    4 +++
 sysdeps/unix/sysv/linux/generic/not-cancel.h |   30 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/generic/not-cancel.h

diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 83a2db1..a2f6a56 100644
--- a/ChangeLog.linux-generic
+++ b/ChangeLog.linux-generic
@@ -1,5 +1,9 @@
 2012-01-30  Chris Metcalf  <cmetcalf@tilera.com>

+       * sysdeps/unix/sysv/linux/generic/not-cancel.h: New file.
+
+2012-01-30  Chris Metcalf  <cmetcalf@tilera.com>
+
        * sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove
        libc_hidden_proto declaration now it's in sys/epoll.h override.

diff --git a/sysdeps/unix/sysv/linux/generic/not-cancel.h b/sysdeps/unix/sysv/linux/generic/not-cancel.h
new file mode 100644
index 0000000..a95e2e9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/generic/not-cancel.h
@@ -0,0 +1,30 @@
+/* Uncancelable versions of cancelable interfaces.  Linux asm-generic version.
+   Copyright (C) 2012 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2012.
+
+   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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdeps/unix/sysv/linux/not-cancel.h>
+#include <fcntl.h>
+
+/* Uncancelable open with openat.  */
+#undef open_not_cancel
+#define open_not_cancel(name, flags, mode) \
+  INLINE_SYSCALL (openat, 4, AT_FDCWD, (const char *) (name), (flags), (mode))
+#undef open_not_cancel_2
+#define open_not_cancel_2(name, flags) \
+  INLINE_SYSCALL (openat, 3, AT_FDCWD, (const char *) (name), (flags))
--
1.7.1



-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]