OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix sched_param" 

This reverts commit 783c482030 which
accidentaly flew out.
This commit is contained in:
Samuel Thibault 2018-04-19 00:09:58 +02:00
parent 3dc0814cba
commit c15f10ee78
9 changed files with 17 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bits/sched.h
View File

@ -29,6 +29,10 @@
#define SCHED_FIFO 1
#define SCHED_RR 2
#include <bits/types/struct_sched_param.h>
/* Data structure to describe a process' schedulability. */
struct sched_param
{
int sched_priority;
};
#endif /* bits/sched.h */

28
bits/types/struct___sched_param.h
View File

@ -1,28 +0,0 @@
/* Sched parameter structure. Generic version.
Copyright (C) 1996-2018 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, see
<http://www.gnu.org/licenses/>. */
#ifndef _BITS_TYPES_STRUCT___SCHED_PARAM
#define _BITS_TYPES_STRUCT___SCHED_PARAM 1
/* Data structure to describe a process' schedulability. */
struct __sched_param
{
int __sched_priority;
};
#endif /* bits/types/struct___sched_param.h */

28
bits/types/struct_sched_param.h
View File

@ -1,28 +0,0 @@
/* Sched parameter structure. Generic version.
Copyright (C) 1996-2018 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, see
<http://www.gnu.org/licenses/>. */
#ifndef _BITS_TYPES_STRUCT_SCHED_PARAM
#define _BITS_TYPES_STRUCT_SCHED_PARAM 1
/* Data structure to describe a process' schedulability. */
struct sched_param
{
int sched_priority;
};
#endif /* bits/types/struct_sched_param.h */

3
posix/Makefile
View File

@ -31,8 +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 \
bits/types/struct___sched_param.h bits/types/struct_sched_param.h
cpio.h spawn.h bits/unistd.h
routines := \
uname \

2
posix/sched.h
View File

@ -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

4
sysdeps/htl/bits/types/struct___pthread_attr.h
View File

@ -19,7 +19,7 @@
#ifndef _BITS_TYPES_STRUCT___PTHREAD_ATTR
#define _BITS_TYPES_STRUCT___PTHREAD_ATTR 1
#include <bits/types/struct___sched_param.h>
#include <sched.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;

2
sysdeps/htl/pt-attr.c
View File

@ -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

4
sysdeps/htl/timer_routines.h
View File

@ -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

6
sysdeps/unix/sysv/linux/bits/sched.h
View File

@ -71,7 +71,11 @@
# define CLONE_IO 0x80000000 /* Clone I/O context. */
#endif
#include <bits/types/struct_sched_param.h>
/* Data structure to describe a process' schedulability. */
struct sched_param
{
int sched_priority;
};
__BEGIN_DECLS