[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r3010 - in /fsf/trunk/libc: ./ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/i386/
- To: commits@xxxxxxxxxx
- Subject: [commits] r3010 - in /fsf/trunk/libc: ./ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/i386/
- From: eglibc@xxxxxxxxxx
- Date: Thu, 02 Aug 2007 07:05:40 -0000
Author: eglibc
Date: Thu Aug 2 00:05:37 2007
New Revision: 3010
Log:
Import glibc-mainline for 2007-08-02
Added:
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Aug 2 00:05:37 2007
@@ -1,3 +1,16 @@
+2007-08-01 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Using
+ /proc is faster and sufficient. /sys is still needed for
+ __get_nprocs_conf.
+
+2007-08-01 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/syscalls.list (fallocate): Add fallocate
+ syscall as __fallocate64.
+ * sysdeps/unix/sysv/linux/i386/posix_fallocate.c: New file.
+ * sysdeps/unix/sysv/linux/i386/posix_fallocate64.c: New file.
+
2007-07-30 Jakub Jelinek <jakub@xxxxxxxxxx>
* stdlib/tst-strtod2.c (do_test): Use %tu in fmt string for ptrdiff_t
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/getsysstats.c Thu Aug 2 00:05:37 2007
@@ -68,9 +68,11 @@
#endif
-static int
-count_processors_in_proc (void)
-{
+int
+__get_nprocs ()
+{
+ /* XXX Here will come a test for the new system call. */
+
char buffer[8192];
int result = 1;
@@ -101,62 +103,6 @@
}
return result;
-}
-
-
-int
-__get_nprocs ()
-{
- /* XXX Here will come a test for the new system call. */
-
- /* Try to use the sysfs filesystem. It has actual information about
- online processors. */
- DIR *dir = __opendir ("/sys/devices/system/cpu");
- if (dir != NULL)
- {
- int dfd = dirfd (dir);
- int count = 0;
- struct dirent64 *d;
-
- while ((d = __readdir64 (dir)) != NULL)
- /* NB: the sysfs has d_type support. */
- if (d->d_type == DT_DIR && strncmp (d->d_name, "cpu", 3) == 0)
- {
- char *endp;
- unsigned long int nr = strtoul (d->d_name + 3, &endp, 10);
- if (nr != ULONG_MAX && endp != d->d_name + 3 && *endp == '\0')
- {
- /* Try reading the online file. */
- char oname[_D_ALLOC_NAMLEN (d) + sizeof "/online"];
- strcpy (stpcpy (oname, d->d_name), "/online");
-
- /* We unconditionally use openat since the "online"
- file became readable only after the openat system
- call was introduced. */
- char buf[1];
- int fd = openat_not_cancel_3 (dfd, oname, O_RDONLY);
-
- /* If we cannot read the online file we have to assume
- the CPU is online. */
- if (fd < 0)
- ++count;
- else
- {
- if (read_not_cancel (fd, buf, sizeof (buf)) < 0
- || buf[0] == '1')
- ++count;
-
- close_not_cancel_no_status (fd);
- }
- }
- }
-
- __closedir (dir);
-
- return count;
- }
-
- return count_processors_in_proc ();
}
weak_alias (__get_nprocs, get_nprocs)
@@ -206,7 +152,7 @@
fclose (fp);
}
#else
- result = count_processors_in_proc ();
+ result = __get_nprocs ();
#endif
return result;
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate.c Thu Aug 2 00:05:37 2007
@@ -1,0 +1,58 @@
+/* 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 <fcntl.h>
+#include <kernel-features.h>
+#include <sysdep.h>
+
+#define posix_fallocate static internal_fallocate
+#include <sysdeps/posix/posix_fallocate.c>
+#undef posix_fallocate
+
+#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
+int __have_fallocate attribute_hidden;
+#endif
+
+extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
+ attribute_hidden;
+
+/* Reserve storage for the data of the file associated with FD. */
+int
+posix_fallocate (int fd, __off_t offset, __off_t len)
+{
+#ifdef __NR_fallocate
+# ifndef __ASSUME_FALLOCATE
+ if (__builtin_expect (__have_fallocate >= 0, 1))
+# endif
+ {
+ int res = __fallocate64 (fd, 0, offset, len);
+ if (! res)
+ return 0;
+
+# ifndef __ASSUME_FALLOCATE
+ if (__builtin_expect (res == ENOSYS, 0))
+ __have_fallocate = -1;
+ else
+# endif
+ if (res != EOPNOTSUPP)
+ return res;
+ }
+#endif
+
+ return internal_fallocate (fd, offset, len);
+}
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/posix_fallocate64.c Thu Aug 2 00:05:37 2007
@@ -1,0 +1,61 @@
+/* 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 <fcntl.h>
+#include <kernel-features.h>
+#include <sysdep.h>
+
+extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
+#define __posix_fallocate64_l64 static internal_fallocate64
+#include <sysdeps/posix/posix_fallocate64.c>
+#undef __posix_fallocate64_l64
+
+#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
+/* Defined in posix_fallocate.c. */
+extern int __have_fallocate attribute_hidden;
+#endif
+
+extern int __fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
+ attribute_hidden;
+
+/* Reserve storage for the data of the file associated with FD. */
+int
+__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
+{
+#ifdef __NR_fallocate
+# ifndef __ASSUME_FALLOCATE
+ if (__builtin_expect (__have_fallocate >= 0, 1))
+# endif
+ {
+ int res = __fallocate64 (fd, 0, offset, len);
+
+ if (! res)
+ return 0;
+
+# ifndef __ASSUME_FALLOCATE
+ if (__builtin_expect (res == ENOSYS, 0))
+ __have_fallocate = -1;
+ else
+# endif
+ if (res != EOPNOTSUPP)
+ return res;
+ }
+#endif
+
+ return internal_fallocate64 (fd, offset, len);
+}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list Thu Aug 2 00:05:37 2007
@@ -6,3 +6,4 @@
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@xxxxxxxxx
oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@xxxxxxxxx
waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid
+fallocate64 EXTRA fallocate Vi:iiiiii __fallocate64