Author: sthibault
Date: 2011-02-10 18:16:58 +0000 (Thu, 10 Feb 2011)
New Revision: 4517
Added:
glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-sched_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/any/submitted-sched_h.diff: rename to cvs-sched_h.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-02-10 17:31:23 UTC (rev
4516)
+++ glibc-package/trunk/debian/changelog 2011-02-10 18:16:58 UTC (rev
4517)
@@ -5,7 +5,8 @@
[ Samuel Thibault ]
* patches/any/submitted-sched_h.diff: Synchronize bits/sched.h with
- sysdeps/unix/sysv/linux/bits/sched.h (Closes: #527589)
+ sysdeps/unix/sysv/linux/bits/sched.h (Closes: #527589), rename to
+ cvs-sched_h.diff.
[ Clint Adams ]
* Patch from Nobuhiro Iwamatsu to cope with the removal of
Copied: glibc-package/trunk/debian/patches/any/cvs-sched_h.diff (from rev 4512,
glibc-package/trunk/debian/patches/any/submitted-sched_h.diff)
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sched_h.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-sched_h.diff 2011-02-10
18:16:58 UTC (rev 4517)
@@ -0,0 +1,139 @@
+2011-01-30 Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+Synchronize bits/sched.h with ./sysdeps/unix/sysv/linux/bits/sched.h
+
+This brings the variable-size cpu_set_t manipulation macros from
+./sysdeps/unix/sysv/linux/bits/sched.h
+
+* bits/sched.h (__CPU_ZERO, __CPU_SET, __CPU_CLR, __CPU_ISSET,
+__CPU_COUNT): Remove old macros.
+(__CPU_ZERO_S, __CPU_SET_S, __CPU_CLR_S, __CPU_ISSET_S, __CPU_COUNT,
+__CPU_EQUAL_S, __CPU_OP_S, __CPU_ALLOC_SIZE, __CPU_ALLOC, __CPU_FREE): Add
+macros.
+(__sched_cpualloc, __sched_cpufree): Add declarations.
+
+---
+http://sourceware.org/ml/libc-alpha/2011-01/msg00054.html
+
+ sched.h | 87
++++++++++++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 72 insertions(+), 15 deletions(-)
+
+diff --git a/bits/sched.h b/bits/sched.h
+index a068e50..9a22ae3 100644
+--- a/bits/sched.h
++++ b/bits/sched.h
+@@ -1,6 +1,7 @@
+ /* Definitions of constants and data structure for POSIX 1003.1b-1993
+ scheduling interface.
+- Copyright (C) 1996, 1997, 2001, 2003, 2007 Free Software Foundation, Inc.
++ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009
++ 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
+@@ -56,7 +57,7 @@ struct __sched_param
+ # define __CPU_SETSIZE 1024
+ # define __NCPUBITS (8 * sizeof (__cpu_mask))
+
+-/* Type for array elements in 'cpu_set'. */
++/* Type for array elements in 'cpu_set_t'. */
+ typedef unsigned long int __cpu_mask;
+
+ /* Basic access functions. */
+@@ -70,27 +71,83 @@ typedef struct
+ } cpu_set_t;
+
+ /* Access functions for CPU masks. */
+-# define __CPU_ZERO(cpusetp) \
++# if __GNUC_PREREQ (2, 91)
++# define __CPU_ZERO_S(setsize, cpusetp) \
++ do __builtin_memset (cpusetp, '\0', setsize); while (0)
++# else
++# define __CPU_ZERO_S(setsize, cpusetp) \
+ do {
\
+- unsigned int __i; \
+- cpu_set *__arr = (cpusetp);
\
+- for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i)
\
+- __arr->__bits[__i] = 0; \
++ size_t __i;
\
++ size_t __imax = (setsize) / sizeof (__cpu_mask); \
++ __cpu_mask *__bits = (cpusetp)->__bits; \
++ for (__i = 0; __i < __imax; ++__i)
\
++ __bits[__i] = 0;
\
+ } while (0)
+-# define __CPU_SET(cpu, cpusetp) \
+- ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu))
+-# define __CPU_CLR(cpu, cpusetp) \
+- ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu))
+-# define __CPU_ISSET(cpu, cpusetp) \
+- (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
++# endif
++# define __CPU_SET_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
++ |= __CPUMASK (__cpu)) \
++ : 0; }))
++# define __CPU_CLR_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
++ &= ~__CPUMASK (__cpu)) \
++ : 0; }))
++# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
++ & __CPUMASK (__cpu))) != 0 \
++ : 0; }))
++
++# define __CPU_COUNT_S(setsize, cpusetp) \
++ __sched_cpucount (setsize, cpusetp)
++
++# if __GNUC_PREREQ (2, 91)
++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
++ (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
++# else
++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
++ (__extension__ \
++ ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits;
\
++ __const __cpu_mask *__arr2 = (cpusetp2)->__bits;
\
++ size_t __imax = (setsize) / sizeof (__cpu_mask);
\
++ size_t __i; \
++ for (__i = 0; __i < __imax; ++__i) \
++ if (__bits[__i] != __bits[__i]) \
++ break; \
++ __i == __imax; }))
++# endif
++
++# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
++ (__extension__ \
++ ({ cpu_set_t *__dest = (destset); \
++ __const __cpu_mask *__arr1 = (srcset1)->__bits; \
++ __const __cpu_mask *__arr2 = (srcset2)->__bits; \
++ size_t __imax = (setsize) / sizeof (__cpu_mask);
\
++ size_t __i; \
++ for (__i = 0; __i < __imax; ++__i) \
++ ((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i]; \
++ __dest; }))
++
++# define __CPU_ALLOC_SIZE(count) \
++ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
++# define __CPU_ALLOC(count) __sched_cpualloc (count)
++# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
+
+ __BEGIN_DECLS
+
+ extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
+ __THROW;
++extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
++extern void __sched_cpufree (cpu_set_t *__set) __THROW;
+
+ __END_DECLS
+
+-# define __CPU_COUNT(cpusetp) \
+- __sched_cpucount (sizeof (cpu_set_t), cpusetp)
+ #endif
Deleted: glibc-package/trunk/debian/patches/any/submitted-sched_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-sched_h.diff
2011-02-10 17:31:23 UTC (rev 4516)
+++ glibc-package/trunk/debian/patches/any/submitted-sched_h.diff
2011-02-10 18:16:58 UTC (rev 4517)
@@ -1,139 +0,0 @@
-2011-01-30 Samuel Thibault <samuel.thiba...@ens-lyon.org>
-
-Synchronize bits/sched.h with ./sysdeps/unix/sysv/linux/bits/sched.h
-
-This brings the variable-size cpu_set_t manipulation macros from
-./sysdeps/unix/sysv/linux/bits/sched.h
-
-* bits/sched.h (__CPU_ZERO, __CPU_SET, __CPU_CLR, __CPU_ISSET,
-__CPU_COUNT): Remove old macros.
-(__CPU_ZERO_S, __CPU_SET_S, __CPU_CLR_S, __CPU_ISSET_S, __CPU_COUNT,
-__CPU_EQUAL_S, __CPU_OP_S, __CPU_ALLOC_SIZE, __CPU_ALLOC, __CPU_FREE): Add
-macros.
-(__sched_cpualloc, __sched_cpufree): Add declarations.
-
----
-http://sourceware.org/ml/libc-alpha/2011-01/msg00054.html
-
- sched.h | 87
++++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 72 insertions(+), 15 deletions(-)
-
-diff --git a/bits/sched.h b/bits/sched.h
-index a068e50..9a22ae3 100644
---- a/bits/sched.h
-+++ b/bits/sched.h
-@@ -1,6 +1,7 @@
- /* Definitions of constants and data structure for POSIX 1003.1b-1993
- scheduling interface.
-- Copyright (C) 1996, 1997, 2001, 2003, 2007 Free Software Foundation, Inc.
-+ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009
-+ 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
-@@ -56,7 +57,7 @@ struct __sched_param
- # define __CPU_SETSIZE 1024
- # define __NCPUBITS (8 * sizeof (__cpu_mask))
-
--/* Type for array elements in 'cpu_set'. */
-+/* Type for array elements in 'cpu_set_t'. */
- typedef unsigned long int __cpu_mask;
-
- /* Basic access functions. */
-@@ -70,27 +71,83 @@ typedef struct
- } cpu_set_t;
-
- /* Access functions for CPU masks. */
--# define __CPU_ZERO(cpusetp) \
-+# if __GNUC_PREREQ (2, 91)
-+# define __CPU_ZERO_S(setsize, cpusetp) \
-+ do __builtin_memset (cpusetp, '\0', setsize); while (0)
-+# else
-+# define __CPU_ZERO_S(setsize, cpusetp) \
- do {
\
-- unsigned int __i; \
-- cpu_set *__arr = (cpusetp);
\
-- for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i)
\
-- __arr->__bits[__i] = 0; \
-+ size_t __i;
\
-+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
-+ __cpu_mask *__bits = (cpusetp)->__bits; \
-+ for (__i = 0; __i < __imax; ++__i)
\
-+ __bits[__i] = 0;
\
- } while (0)
--# define __CPU_SET(cpu, cpusetp) \
-- ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu))
--# define __CPU_CLR(cpu, cpusetp) \
-- ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu))
--# define __CPU_ISSET(cpu, cpusetp) \
-- (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
-+# endif
-+# define __CPU_SET_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
-+ |= __CPUMASK (__cpu)) \
-+ : 0; }))
-+# define __CPU_CLR_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
-+ &= ~__CPUMASK (__cpu)) \
-+ : 0; }))
-+# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]
\
-+ & __CPUMASK (__cpu))) != 0 \
-+ : 0; }))
-+
-+# define __CPU_COUNT_S(setsize, cpusetp) \
-+ __sched_cpucount (setsize, cpusetp)
-+
-+# if __GNUC_PREREQ (2, 91)
-+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+ (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
-+# else
-+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+ (__extension__ \
-+ ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits;
\
-+ __const __cpu_mask *__arr2 = (cpusetp2)->__bits;
\
-+ size_t __imax = (setsize) / sizeof (__cpu_mask);
\
-+ size_t __i; \
-+ for (__i = 0; __i < __imax; ++__i) \
-+ if (__bits[__i] != __bits[__i]) \
-+ break; \
-+ __i == __imax; }))
-+# endif
-+
-+# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-+ (__extension__ \
-+ ({ cpu_set_t *__dest = (destset); \
-+ __const __cpu_mask *__arr1 = (srcset1)->__bits; \
-+ __const __cpu_mask *__arr2 = (srcset2)->__bits; \
-+ size_t __imax = (setsize) / sizeof (__cpu_mask);
\
-+ size_t __i; \
-+ for (__i = 0; __i < __imax; ++__i) \
-+ ((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i]; \
-+ __dest; }))
-+
-+# define __CPU_ALLOC_SIZE(count) \
-+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
-+# define __CPU_ALLOC(count) __sched_cpualloc (count)
-+# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
-
- __BEGIN_DECLS
-
- extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
- __THROW;
-+extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
-+extern void __sched_cpufree (cpu_set_t *__set) __THROW;
-
- __END_DECLS
-
--# define __CPU_COUNT(cpusetp) \
-- __sched_cpucount (sizeof (cpu_set_t), cpusetp)
- #endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-02-10 17:31:23 UTC (rev
4516)
+++ glibc-package/trunk/debian/patches/series 2011-02-10 18:16:58 UTC (rev
4517)
@@ -226,7 +226,7 @@
any/submitted-nis-netgrp.diff
any/submitted-clock-settime.diff
any/submitted-longdouble.diff
-any/submitted-sched_h.diff
+any/cvs-sched_h.diff
any/local-disable-nscd-host-caching.diff
#any/submitted-fileops-and-signals.diff # has issues
any/local-missing-linux_types.h.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pnb4l-00061j...@alioth.debian.org
