This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc 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]

GNU C Library master sources branch master updated. glibc-2.27.9000-330-ge60c3f2


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  e60c3f2bb71210ca62dc09b1b797443a88b4e3cf (commit)
      from  50511ca46641eb76aef1ca3fd96ad1e97f95c199 (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=e60c3f2bb71210ca62dc09b1b797443a88b4e3cf

commit e60c3f2bb71210ca62dc09b1b797443a88b4e3cf
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Apr 19 20:21:33 2018 +0200

    hurd: Avoid exposing all <sched.h> symbols from sys/types.h
    
    	* bits/sched.h: Include <bits/types/struct_sched_param.h> and move struct
    	sched_param definition to it.
    	* sysdeps/unix/sysv/linux/bits/sched.h: Likewise.
    	* bits/types/struct_sched_param.h: New file.
    	* sysdeps/htl/bits/types/struct___pthread_attr.h: Include
    	<bits/types/struct_sched_param.h> instead of <sched.h>.
    	* posix/Makefile (headers): Add bits/types/struct_sched_param.h.

diff --git a/ChangeLog b/ChangeLog
index 274941b..d010e7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,13 @@
 	instead of wait_queue.
 	* sysdeps/gnu/bits/shm.h (struct shmid_ds): Use __vm_area_struct
 	instead of vm_area_struct.
+	* bits/sched.h: Include <bits/types/struct_sched_param.h> and move struct
+	sched_param definition to it.
+	* sysdeps/unix/sysv/linux/bits/sched.h: Likewise.
+	* bits/types/struct_sched_param.h: New file.
+	* sysdeps/htl/bits/types/struct___pthread_attr.h: Include
+	<bits/types/struct_sched_param.h> instead of <sched.h>.
+	* posix/Makefile (headers): Add bits/types/struct_sched_param.h.
 
 2018-04-18  Joseph Myers  <joseph@codesourcery.com>
 
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 67%
copy from bits/sched.h
copy to bits/types/struct_sched_param.h
index 8d9f077..2f24d42 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..e9730ee 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -31,7 +31,7 @@ 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
 
 routines :=								      \
 	uname								      \
diff --git a/sysdeps/htl/bits/types/struct___pthread_attr.h b/sysdeps/htl/bits/types/struct___pthread_attr.h
index 2299c01..3c78291 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>
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                                          |    7 ++++++
 bits/sched.h                                       |    6 +----
 .../flockfile.c => bits/types/struct_sched_param.h |   21 +++++++++----------
 posix/Makefile                                     |    2 +-
 sysdeps/htl/bits/types/struct___pthread_attr.h     |    2 +-
 sysdeps/unix/sysv/linux/bits/sched.h               |    6 +----
 6 files changed, 21 insertions(+), 23 deletions(-)
 copy stdio-common/flockfile.c => bits/types/struct_sched_param.h (69%)


hooks/post-receive
-- 
GNU C Library master sources


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