[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r2206 - in /fsf/trunk/libc: ./ include/ include/sys/ io/ io/sys/ nptl/ nptl/sysdeps/unix/sysv/linux/ nptl/sysdeps/unix/sysv/...
- To: commits@xxxxxxxxxx
- Subject: [commits] r2206 - in /fsf/trunk/libc: ./ include/ include/sys/ io/ io/sys/ nptl/ nptl/sysdeps/unix/sysv/linux/ nptl/sysdeps/unix/sysv/...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 11 May 2007 07:03:04 -0000
Author: eglibc
Date: Fri May 11 00:03:03 2007
New Revision: 2206
Log:
Import glibc-mainline for 2007-05-11
Added:
fsf/trunk/libc/io/futimens.c
fsf/trunk/libc/io/utimensat.c
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/futimens.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/lutimes.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-getcpu.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/utimensat.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/include/link.h
fsf/trunk/libc/include/sys/cdefs.h
fsf/trunk/libc/io/Makefile
fsf/trunk/libc/io/Versions
fsf/trunk/libc/io/sys/stat.h
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/descr.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
fsf/trunk/libc/nptl/tst-align2.c
fsf/trunk/libc/nptl/tst-getpid1.c
fsf/trunk/libc/scripts/check-c++-types.sh
fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sched_setaffinity.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/stat.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri May 11 00:03:03 2007
@@ -1,3 +1,45 @@
+2007-05-10 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/tst-getcpu.c: New file.
+ * sysdeps/unix/sysv/linux/Makefile [subdir=posix] (tests): Add
+ tst-getcpu.
+
+ * include/link.h: Move l_version and l_nversion members around to
+ fill gaps.
+
+ * scripts/check-c++-types.sh: Don't use -fnu89-inline option.
+
+ * sysdeps/unix/sysv/linux/sched_setaffinity.c
+ (__sched_setaffinity_new): If syscall was successful and
+ RESET_VGETCPU_CACHE is defined, use it before returning.
+ * sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c: New file.
+
+ * io/sys/stat.h: Make sure struct timespec is defined for
+ __USE_ATFILE.
+
+ * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Define UTIME_NOW and
+ UTIME_OMIT.
+ * sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_UTIMENSAT.
+ * io/sys/stat.h: Declare utimensat, futimens.
+ * io/utimensat.c: New file.
+ * io/futimens.c: New file.
+ * sysdeps/unix/sysv/linux/utimensat.c: New file.
+ * sysdeps/unix/sysv/linux/futimens.c: New file.
+ * io/Makefile (routines): Add utimensat, futimens.
+ * io/Versions: Add utimensat, futimens to GLIBC_2.6.
+ * sysdeps/unix/sysv/linux/lutimes.c: New file.
+ * sysdeps/unix/sysv/linux/futimes.c: Use utimensat syscall if
+ available.
+
+ * include/sys/cdefs.h: Redefine __nonnull so that test for
+ incorrect parameters in the libc code itself are not omitted.
+
2007-05-09 Jakub Jelinek <jakub@xxxxxxxxxx>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
Modified: fsf/trunk/libc/include/link.h
==============================================================================
--- fsf/trunk/libc/include/link.h (original)
+++ fsf/trunk/libc/include/link.h Fri May 11 00:03:03 2007
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
- Copyright (C) 1995-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-2006, 2007 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
@@ -140,6 +140,10 @@
/* Dependent object that first caused this object to be loaded. */
struct link_map *l_loader;
+
+ /* Array with version names. */
+ struct r_found_version *l_versions;
+ unsigned int l_nversions;
/* Symbol hash table. */
Elf_Symndx l_nbuckets;
@@ -184,10 +188,6 @@
unsigned int l_removed:1; /* Nozero if the object cannot be used anymore
since it is removed. */
- /* Array with version names. */
- unsigned int l_nversions;
- struct r_found_version *l_versions;
-
/* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs;
Modified: fsf/trunk/libc/include/sys/cdefs.h
==============================================================================
--- fsf/trunk/libc/include/sys/cdefs.h (original)
+++ fsf/trunk/libc/include/sys/cdefs.h Fri May 11 00:03:03 2007
@@ -1,6 +1,12 @@
#ifndef _SYS_CDEFS_H
#include <misc/sys/cdefs.h>
+
+/* The compiler will optimize based on the knowledge the parameter is
+ not NULL. This will omit tests. A robust implementation cannot allow
+ this so when compiling glibc itself we ignore this attribute. */
+#undef __nonnull
+#define __nonnull(params)
extern void __chk_fail (void) __attribute__ ((__noreturn__));
libc_hidden_proto (__chk_fail)
Modified: fsf/trunk/libc/io/Makefile
==============================================================================
--- fsf/trunk/libc/io/Makefile (original)
+++ fsf/trunk/libc/io/Makefile Fri May 11 00:03:03 2007
@@ -51,7 +51,8 @@
ftw ftw64 fts poll ppoll \
posix_fadvise posix_fadvise64 \
posix_fallocate posix_fallocate64 \
- sendfile sendfile64
+ sendfile sendfile64 \
+ utimensat futimens
# These routines will be omitted from the libc shared object.
# Instead the static object files will be included in a special archive
Modified: fsf/trunk/libc/io/Versions
==============================================================================
--- fsf/trunk/libc/io/Versions (original)
+++ fsf/trunk/libc/io/Versions Fri May 11 00:03:03 2007
@@ -113,4 +113,7 @@
ppoll;
}
+ GLIBC_2.6 {
+ utimensat; futimens;
+ }
}
Added: fsf/trunk/libc/io/futimens.c
==============================================================================
--- fsf/trunk/libc/io/futimens.c (added)
+++ fsf/trunk/libc/io/futimens.c Fri May 11 00:03:03 2007
@@ -1,0 +1,36 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include <sysdep.h>
+
+
+/* Change the access time of the file associated with FD to TSP[0] and
+ the modification time of FILE to TSP[1]. */
+int
+futimens (int fd, const struct timespec tsp[2])
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (futimens)
+#include <stub-tag.h>
Modified: fsf/trunk/libc/io/sys/stat.h
==============================================================================
--- fsf/trunk/libc/io/sys/stat.h (original)
+++ fsf/trunk/libc/io/sys/stat.h Fri May 11 00:03:03 2007
@@ -28,11 +28,12 @@
#include <bits/types.h> /* For __mode_t and __dev_t. */
-#if defined __USE_XOPEN || defined __USE_MISC
+#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_MISC \
+ || defined __USE_ATFILE
# if defined __USE_XOPEN || defined __USE_XOPEN2K
# define __need_time_t
# endif
-# ifdef __USE_MISC
+# if defined __USE_MISC || defined __USE_ATFILE
# define __need_timespec
# endif
# include <time.h> /* For time_t resp. timespec. */
@@ -352,6 +353,21 @@
with FD. */
extern int mkfifoat (int __fd, __const char *__path, __mode_t __mode)
__THROW __nonnull ((2));
+#endif
+
+#ifdef __USE_ATFILE
+/* Set file access and modification times relative to directory file
+ descriptor. */
+extern int utimensat (int __fd, __const char *__path,
+ __const struct timespec __times[2],
+ int __flags)
+ __THROW __nonnull ((2));
+#endif
+
+#ifdef __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+/* Set file access and modification times of the file associated with FD. */
+extern int futimens (int __fd, __const struct timespec __times[2]) __THROW;
#endif
/* To allow the `struct stat' structure and the file type `mode_t'
Added: fsf/trunk/libc/io/utimensat.c
==============================================================================
--- fsf/trunk/libc/io/utimensat.c (added)
+++ fsf/trunk/libc/io/utimensat.c Fri May 11 00:03:03 2007
@@ -1,0 +1,34 @@
+/* Change access and modification times of open file. Stub version.
+ Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <sys/stat.h>
+
+
+/* Change the access time of FILE to TSP[0] and
+ the modification time of FILE to TSP[1]. */
+int
+utimensat (int fd, const char *file, const struct timespec tsp[2],
+ int flags)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (utimensat)
+#include <stub-tag.h>
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri May 11 00:03:03 2007
@@ -1,3 +1,19 @@
+2007-05-10 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * descr.h (struct pthread): Rearrange members to fill hole in
+ 64-bit layout.
+
+ * sysdeps/unix/sysv/linux/pthread_setaffinity.c
+ (__pthread_setaffinity_new): If syscall was successful and
+ RESET_VGETCPU_CACHE is defined, use it before returning.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c: New file.
+
+2007-05-10 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ [BZ #4455]
+ * tst-align2.c: Include stackinfo.h.
+ * tst-getpid1.c: Likewise.
+
2007-05-02 Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
[BZ #4455]
Modified: fsf/trunk/libc/nptl/descr.h
==============================================================================
--- fsf/trunk/libc/nptl/descr.h (original)
+++ fsf/trunk/libc/nptl/descr.h Fri May 11 00:03:03 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -268,6 +268,9 @@
| EXITING_BITMASK | CANCEL_RESTMASK | TERMINATED_BITMASK)) \
== (CANCELTYPE_BITMASK | CANCELED_BITMASK))
+ /* Flags. Including those copied from the thread attribute. */
+ int flags;
+
/* We allocate one block of references here. This should be enough
to avoid allocating any memory dynamically for most applications. */
struct pthread_key_data
@@ -320,9 +323,6 @@
struct pthread *joinid;
/* Check whether a thread is detached. */
#define IS_DETACHED(pd) ((pd)->joinid == (pd))
-
- /* Flags. Including those copied from the thread attribute. */
- int flags;
/* The result of the thread function. */
void *result;
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c Fri May 11 00:03:03 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2003.
@@ -79,6 +79,12 @@
res = INTERNAL_SYSCALL (sched_setaffinity, err, 3, pd->tid, cpusetsize,
cpuset);
+
+#ifdef RESET_VGETCPU_CACHE
+ if (!INTERNAL_SYSCALL_ERROR_P (res, err))
+ RESET_VGETCPU_CACHE ();
+#endif
+
return (INTERNAL_SYSCALL_ERROR_P (res, err)
? INTERNAL_SYSCALL_ERRNO (res, err)
: 0);
Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c (added)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c Fri May 11 00:03:03 2007
@@ -1,0 +1,14 @@
+#include <tls.h>
+
+#define RESET_VGETCPU_CACHE() \
+ do { \
+ asm volatile ("movl %0, %%fs:%P1\n\t" \
+ "movl %0, %%fs:%P2" \
+ : \
+ : "ir" (0), "i" (offsetof (struct pthread, \
+ header.vgetcpu_cache[0])), \
+ "i" (offsetof (struct pthread, \
+ header.vgetcpu_cache[1]))); \
+ } while (0)
+
+#include "../pthread_setaffinity.c"
Modified: fsf/trunk/libc/nptl/tst-align2.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-align2.c (original)
+++ fsf/trunk/libc/nptl/tst-align2.c Fri May 11 00:03:03 2007
@@ -24,6 +24,7 @@
#include <sys/wait.h>
#include <unistd.h>
#include <tst-stack-align.h>
+#include <stackinfo.h>
static int
f (void *arg)
Modified: fsf/trunk/libc/nptl/tst-getpid1.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-getpid1.c (original)
+++ fsf/trunk/libc/nptl/tst-getpid1.c Fri May 11 00:03:03 2007
@@ -5,6 +5,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <stackinfo.h>
#ifndef TEST_CLONE_FLAGS
#define TEST_CLONE_FLAGS 0
Modified: fsf/trunk/libc/scripts/check-c++-types.sh
==============================================================================
--- fsf/trunk/libc/scripts/check-c++-types.sh (original)
+++ fsf/trunk/libc/scripts/check-c++-types.sh Fri May 11 00:03:03 2007
@@ -1,5 +1,5 @@
#! /bin/bash
-# Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006, 2007 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
@@ -32,7 +32,7 @@
#
data=$1
shift
-cxx="$*"
+cxx=$(echo $* | sed 's/-fgnu89-inline//')
while read t; do
echo -n "$t:"
$cxx -S -xc++ -o - -D_GNU_SOURCE <(cat <<EOF
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
Binary files - no diff available.
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/alpha/bits/stat.h Fri May 11 00:03:03 2007
@@ -149,3 +149,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/stat.h Fri May 11 00:03:03 2007
@@ -161,3 +161,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/futimens.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/futimens.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/futimens.c Fri May 11 00:03:03 2007
@@ -1,0 +1,45 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include <sysdep.h>
+
+
+/* Change the access time of the file associated with FD to TSP[0] and
+ the modification time of FILE to TSP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall which
+ can be used to implement futimens. */
+int
+futimens (int fd, const struct timespec tsp[2])
+{
+#ifdef __NR_utimensat
+ return INLINE_SYSCALL (utimensat, 4, fd, NULL, tsp, 0);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+#ifndef __NR_utimensat
+stub_warning (futimens)
+# include <stub-tag.h>
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/futimes.c Fri May 11 00:03:03 2007
@@ -20,6 +20,7 @@
#include <errno.h>
#include <sysdep.h>
#include <string.h>
+#include <time.h>
#include <utime.h>
#include <sys/time.h>
#include <stdio-common/_itoa.h>
@@ -27,32 +28,67 @@
#include <kernel-features.h>
-/* Change the access time of FILE to TVP[0] and
- the modification time of FILE to TVP[1], but do not follow symlinks.
- The Linux kernel has no futimes() syscall so we use the /proc
- filesystem. */
+#ifndef __ASSUME_UTIMENSAT
+static int miss_utimensat;
+#endif
+
+/* Change the access time of the file associated with FD to TVP[0] and
+ the modification time of FILE to TVP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall which
+ can be used to implement futimes. Earlier kernels have no futimes()
+ syscall so we use the /proc filesystem. */
int
__futimes (int fd, const struct timeval tvp[2])
{
+ /* The utimensat system call expects timespec not timeval. */
+ struct timespec ts[2];
+ if (tvp != NULL)
+ {
+ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000
+ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
+ TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
+ }
+
+#ifdef __ASSUME_UTIMENSAT
+ return INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0);
+#else
+ int result;
+# ifdef __NR_utimensat
+ if (!__builtin_expect (miss_utimensat, 0))
+ {
+ result = INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0);
+ if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
+ return result;
+
+ miss_utimensat = 1;
+ }
+# endif
+
static const char selffd[] = "/proc/self/fd/";
char fname[sizeof (selffd) + 3 * sizeof (int)];
fname[sizeof (fname) - 1] = '\0';
char *cp = _itoa_word ((unsigned int) fd, fname + sizeof (fname) - 1, 10, 0);
cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1);
- int result;
-#ifdef __NR_utimes
+# ifdef __NR_utimes
result = INLINE_SYSCALL (utimes, 2, cp, tvp);
-# ifndef __ASSUME_UTIMES
+# ifndef __ASSUME_UTIMES
if (result == -1 && errno == ENOSYS)
+# endif
# endif
-#endif
{
/* The utimes() syscall does not exist or is not available in the
used kernel. Use utime(). For this we have to convert to the
data format utime() expects. */
-#ifndef __ASSUME_UTIMES
+# ifndef __ASSUME_UTIMES
struct utimbuf buf;
struct utimbuf *times;
@@ -66,7 +102,7 @@
times = NULL;
result = INLINE_SYSCALL (utime, 2, cp, times);
-#endif
+# endif
}
if (result == -1)
@@ -88,14 +124,15 @@
case ENOENT:
/* Validate the file descriptor by letting fcntl set errno to
EBADF if it's bogus. Otherwise it's a /proc issue. */
-#if !defined __NR_fcntl && defined __NR_fcntl64
-# define __NR_fcntl __NR_fcntl64
-#endif
+# if !defined __NR_fcntl && defined __NR_fcntl64
+# define __NR_fcntl __NR_fcntl64
+# endif
if (INLINE_SYSCALL (fcntl, 3, fd, F_GETFD, 0) != -1)
__set_errno (ENOSYS);
break;
}
return result;
+#endif
}
weak_alias (__futimes, futimes)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/bits/stat.h Fri May 11 00:03:03 2007
@@ -138,3 +138,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h Fri May 11 00:03:03 2007
@@ -458,3 +458,8 @@
#if __LINUX_KERNEL_VERSION >= 0x020612
# define __ASSUME_FUTEX_LOCK_PI 1
#endif
+
+/* Support for utimensat syscall was added in 2.6.22. */
+#if __LINUX_KERNEL_VERSION >= 0x020616
+# define __ASSUME_UTIMENSAT 1
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/lutimes.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/lutimes.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/lutimes.c Fri May 11 00:03:03 2007
@@ -1,0 +1,59 @@
+/* Change access and/or modification date of file. Do not follow symbolic
+ links.
+ Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sysdep.h>
+#include <kernel-features.h>
+
+
+int
+lutimes (const char *file, const struct timeval tvp[2])
+{
+#ifdef __NR_utimensat
+ /* The system call espects timespec, not timeval. */
+ struct timespec ts[2];
+ if (tvp != NULL)
+ {
+ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000
+ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
+ TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
+ }
+
+ return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL,
+ AT_SYMLINK_NOFOLLOW);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+
+#ifndef __NR_utimensat
+stub_warning (lutimes)
+# include <stub-tag.h>
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/stat.h Fri May 11 00:03:03 2007
@@ -265,3 +265,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/stat.h Fri May 11 00:03:03 2007
@@ -254,3 +254,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sched_setaffinity.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sched_setaffinity.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sched_setaffinity.c Fri May 11 00:03:03 2007
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2007
+ 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
@@ -67,7 +68,14 @@
return -1;
}
- return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
+ int result = INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
+
+#ifdef RESET_VGETCPU_CACHE
+ if (result != -1)
+ RESET_VGETCPU_CACHE ();
+#endif
+
+ return result;
}
versioned_symbol (libc, __sched_setaffinity_new, sched_setaffinity,
GLIBC_2_3_4);
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/stat.h Fri May 11 00:03:03 2007
@@ -163,3 +163,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-getcpu.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-getcpu.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-getcpu.c Fri May 11 00:03:03 2007
@@ -1,0 +1,53 @@
+#include <errno.h>
+#include <stdio.h>
+#include <sched.h>
+
+
+static int
+do_test (void)
+{
+ cpu_set_t cs;
+ if (sched_getaffinity (getpid (), sizeof (cs), &cs) != 0)
+ {
+ printf ("getaffinity failed: %m\n");
+ return 1;
+ }
+
+ int result = 0;
+ int cpu = 0;
+ while (CPU_COUNT (&cs) != 0)
+ {
+ if (CPU_ISSET (cpu, &cs))
+ {
+ cpu_set_t cs2;
+ CPU_ZERO (&cs2);
+ CPU_SET (cpu, &cs2);
+ if (sched_setaffinity (getpid (), sizeof (cs2), &cs2) != 0)
+ {
+ printf ("setaffinity(%d) failed: %m\n", cpu);
+ result = 1;
+ }
+ else
+ {
+ int cpu2 = sched_getcpu ();
+ if (cpu2 == -1 && errno == ENOSYS)
+ {
+ puts ("getcpu syscall not implemented");
+ return 0;
+ }
+ if (cpu2 != cpu)
+ {
+ printf ("getcpu results %d not possible\n", cpu2);
+ result = 1;
+ }
+ }
+ CPU_CLR (cpu, &cs);
+ }
+ ++cpu;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include <test-skeleton.c>
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/utimensat.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/utimensat.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/utimensat.c Fri May 11 00:03:03 2007
@@ -1,0 +1,50 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <sys/stat.h>
+#include <sysdep.h>
+
+#include <kernel-features.h>
+
+
+/* Change the access time of FILE to TSP[0] and
+ the modification time of FILE to TSP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall. */
+int
+utimensat (int fd, const char *file, const struct timespec tsp[2],
+ int flags)
+{
+ if (file == NULL)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+#ifdef __NR_utimensat
+ return INLINE_SYSCALL (utimensat, 4, fd, file, tsp, flags);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+#ifndef __NR_utimensat
+stub_warning (utimensat)
+# include <stub-tag.h>
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/stat.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/stat.h Fri May 11 00:03:03 2007
@@ -201,3 +201,9 @@
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c Fri May 11 00:03:03 2007
@@ -1,0 +1,14 @@
+#include <tls.h>
+
+#define RESET_VGETCPU_CACHE() \
+ do { \
+ asm volatile ("movl %0, %%fs:%P1\n\t" \
+ "movl %0, %%fs:%P2" \
+ : \
+ : "ir" (0), "i" (offsetof (struct pthread, \
+ header.vgetcpu_cache[0])), \
+ "i" (offsetof (struct pthread, \
+ header.vgetcpu_cache[1]))); \
+ } while (0)
+
+#include "../sched_setaffinity.c"