This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.27.9000-319-g3dc0814
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Apr 2018 19:08:39 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.27.9000-319-g3dc0814
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 3dc0814cba86180c3ad478c81166220fb3e87ea5 (commit)
via 783c4820303fb6b031d401564f8089ecaf154b62 (commit)
from d6397de369d006da516cb560adfa2c181b6f4698 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3dc0814cba86180c3ad478c81166220fb3e87ea5
commit 3dc0814cba86180c3ad478c81166220fb3e87ea5
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 18 21:07:04 2018 +0200
conform sys/un.h: Allow sun_ prefix, not only sun_len
* conform/data/sys/un.h-data: Allow sun_ prefix.
diff --git a/ChangeLog b/ChangeLog
index 6a41b05..772dbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,7 @@
2018-04-18 Samuel Thibault <samuel.thibault@ens-lyon.org>
- * conform/data/sys/un.h-data (struct sockaddr_un): Allow sun_len
- member.
+ * conform/data/sys/un.h-data: Allow sun_ prefix.
* sysdeps/mach/include/lock-intern.h: Move to include/.
* sysdeps/mach/include/mach.h: Move to include/.
* sysdeps/mach/include/mach/mig_support.h: Move to include/mach/.
diff --git a/conform/data/sys/un.h-data b/conform/data/sys/un.h-data
index 4e00742..08bf9bc 100644
--- a/conform/data/sys/un.h-data
+++ b/conform/data/sys/un.h-data
@@ -1,9 +1,10 @@
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4
type {struct sockaddr_un}
-optional-element {struct sockaddr_un} {unsigned char} sun_len
element {struct sockaddr_un} sa_family_t sun_family
element {struct sockaddr_un} char sun_path []
type sa_family_t
+
+allow sun_*
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=783c4820303fb6b031d401564f8089ecaf154b62
commit 783c4820303fb6b031d401564f8089ecaf154b62
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 18 00:27:31 2018 +0200
Fix sched_param
diff --git a/bits/sched.h b/bits/sched.h
index 8d9f077..bdd94c9 100644
--- a/bits/sched.h
+++ b/bits/sched.h
@@ -29,10 +29,6 @@
#define SCHED_FIFO 1
#define SCHED_RR 2
-/* Data structure to describe a process' schedulability. */
-struct sched_param
-{
- int sched_priority;
-};
+#include <bits/types/struct_sched_param.h>
#endif /* bits/sched.h */
diff --git a/bits/sched.h b/bits/types/struct___sched_param.h
similarity index 64%
copy from bits/sched.h
copy to bits/types/struct___sched_param.h
index 8d9f077..a6d95bf 100644
--- a/bits/sched.h
+++ b/bits/types/struct___sched_param.h
@@ -1,5 +1,4 @@
-/* Definitions of constants and data structure for POSIX 1003.1b-1993
- scheduling interface.
+/* Sched parameter structure. Generic version.
Copyright (C) 1996-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -14,25 +13,16 @@
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
+ License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_SCHED_H
-#define _BITS_SCHED_H 1
-
-#ifndef _SCHED_H
-# error "Never include <bits/sched.h> directly; use <sched.h> instead."
-#endif
-
-/* Scheduling algorithms. */
-#define SCHED_OTHER 0
-#define SCHED_FIFO 1
-#define SCHED_RR 2
+#ifndef _BITS_TYPES_STRUCT___SCHED_PARAM
+#define _BITS_TYPES_STRUCT___SCHED_PARAM 1
/* Data structure to describe a process' schedulability. */
-struct sched_param
+struct __sched_param
{
- int sched_priority;
+ int __sched_priority;
};
-#endif /* bits/sched.h */
+#endif /* bits/types/struct___sched_param.h */
diff --git a/bits/sched.h b/bits/types/struct_sched_param.h
similarity index 67%
copy from bits/sched.h
copy to bits/types/struct_sched_param.h
index 8d9f077..6070702 100644
--- a/bits/sched.h
+++ b/bits/types/struct_sched_param.h
@@ -1,5 +1,4 @@
-/* Definitions of constants and data structure for POSIX 1003.1b-1993
- scheduling interface.
+/* Sched parameter structure. Generic version.
Copyright (C) 1996-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -14,20 +13,11 @@
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
+ License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _BITS_SCHED_H
-#define _BITS_SCHED_H 1
-
-#ifndef _SCHED_H
-# error "Never include <bits/sched.h> directly; use <sched.h> instead."
-#endif
-
-/* Scheduling algorithms. */
-#define SCHED_OTHER 0
-#define SCHED_FIFO 1
-#define SCHED_RR 2
+#ifndef _BITS_TYPES_STRUCT_SCHED_PARAM
+#define _BITS_TYPES_STRUCT_SCHED_PARAM 1
/* Data structure to describe a process' schedulability. */
struct sched_param
@@ -35,4 +25,4 @@ struct sched_param
int sched_priority;
};
-#endif /* bits/sched.h */
+#endif /* bits/types/struct_sched_param.h */
diff --git a/posix/Makefile b/posix/Makefile
index 51dcf12..2a1cb2d 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -31,7 +31,8 @@ headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \
bits/local_lim.h tar.h bits/utsname.h bits/confname.h \
bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h \
bits/sched.h bits/cpu-set.h re_comp.h wait.h bits/environments.h \
- cpio.h spawn.h bits/unistd.h
+ cpio.h spawn.h bits/unistd.h \
+ bits/types/struct___sched_param.h bits/types/struct_sched_param.h
routines := \
uname \
diff --git a/posix/sched.h b/posix/sched.h
index 619b3b3..87a2336 100644
--- a/posix/sched.h
+++ b/posix/sched.h
@@ -45,7 +45,7 @@ typedef __pid_t pid_t;
/* Backward compatibility. */
#define sched_priority sched_priority
-#define __sched_priority sched_priority
+#define __sched_priority __sched_priority
__BEGIN_DECLS
diff --git a/sysdeps/htl/bits/types/struct___pthread_attr.h b/sysdeps/htl/bits/types/struct___pthread_attr.h
index 2299c01..5c4b4e6 100644
--- a/sysdeps/htl/bits/types/struct___pthread_attr.h
+++ b/sysdeps/htl/bits/types/struct___pthread_attr.h
@@ -19,7 +19,7 @@
#ifndef _BITS_TYPES_STRUCT___PTHREAD_ATTR
#define _BITS_TYPES_STRUCT___PTHREAD_ATTR 1
-#include <sched.h>
+#include <bits/types/struct___sched_param.h>
#define __need_size_t
#include <stddef.h>
@@ -32,7 +32,7 @@ enum __pthread_contentionscope;
that not all of them are supported on all systems. */
struct __pthread_attr
{
- struct sched_param __schedparam;
+ struct __sched_param __schedparam;
void *__stackaddr;
size_t __stacksize;
size_t __guardsize;
diff --git a/sysdeps/htl/pt-attr.c b/sysdeps/htl/pt-attr.c
index 77ecc73..fc39aa6 100644
--- a/sysdeps/htl/pt-attr.c
+++ b/sysdeps/htl/pt-attr.c
@@ -24,7 +24,7 @@
#include <pt-internal.h>
const struct __pthread_attr __pthread_default_attr = {
- __schedparam: { sched_priority: 0 },
+ __schedparam: { __sched_priority: 0 },
__stacksize: 0,
__stackaddr: NULL,
#ifdef PAGESIZE
diff --git a/sysdeps/htl/timer_routines.h b/sysdeps/htl/timer_routines.h
index a8134f5..062128c 100644
--- a/sysdeps/htl/timer_routines.h
+++ b/sysdeps/htl/timer_routines.h
@@ -32,8 +32,8 @@ thread_attr_compare (const pthread_attr_t * left, const pthread_attr_t * right)
struct __pthread_attr *ileft = (struct __pthread_attr *) left;
struct __pthread_attr *iright = (struct __pthread_attr *) right;
- return ileft->__schedparam.sched_priority
- == iright->__schedparam.sched_priority
+ return ileft->__schedparam.__sched_priority
+ == iright->__schedparam.__sched_priority
&& ileft->__stackaddr == iright->__stackaddr
&& ileft->__stacksize == iright->__stacksize
&& ileft->__guardsize == iright->__guardsize
diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
index 24159c5..34f27a7 100644
--- a/sysdeps/unix/sysv/linux/bits/sched.h
+++ b/sysdeps/unix/sysv/linux/bits/sched.h
@@ -71,11 +71,7 @@
# define CLONE_IO 0x80000000 /* Clone I/O context. */
#endif
-/* Data structure to describe a process' schedulability. */
-struct sched_param
-{
- int sched_priority;
-};
+#include <bits/types/struct_sched_param.h>
__BEGIN_DECLS
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +-
bits/sched.h | 6 +----
.../types/struct___sched_param.h | 21 +++++++++----------
.../flockfile.c => bits/types/struct_sched_param.h | 21 +++++++++----------
conform/data/sys/un.h-data | 3 +-
posix/Makefile | 3 +-
posix/sched.h | 2 +-
sysdeps/htl/bits/types/struct___pthread_attr.h | 4 +-
sysdeps/htl/pt-attr.c | 2 +-
sysdeps/htl/timer_routines.h | 4 +-
sysdeps/unix/sysv/linux/bits/sched.h | 6 +----
11 files changed, 33 insertions(+), 42 deletions(-)
copy stdio-common/flockfile.c => bits/types/struct___sched_param.h (68%)
copy stdio-common/flockfile.c => bits/types/struct_sched_param.h (69%)
hooks/post-receive
--
GNU C Library master sources