diff options
| author | Guy-Fleury Iteriteka <gfleury@disroot.org> | 2023-07-16 10:44:10 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-08-24 01:57:13 +0200 |
| commit | fb2d92a5b31758900cb147ec8c6f656f404205ba (patch) | |
| tree | fc6adcc1c094c76fb1aa8152ddef065a8213eb46 | |
| parent | 62cf5d2bb3c74aac2f452a77ae0c29c0cc8dde8a (diff) | |
| download | glibc-fb2d92a5b31758900cb147ec8c6f656f404205ba.tar.gz glibc-fb2d92a5b31758900cb147ec8c6f656f404205ba.tar.xz glibc-fb2d92a5b31758900cb147ec8c6f656f404205ba.zip | |
htl: move pthread_attr_setinheritsched into libc
Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org> Message-Id: <20230716084414.107245-7-gfleury@disroot.org>
| -rw-r--r-- | htl/Makefile | 5 | ||||
| -rw-r--r-- | htl/Versions | 2 | ||||
| -rw-r--r-- | htl/forward.c | 3 | ||||
| -rw-r--r-- | htl/pt-initialize.c | 1 | ||||
| -rw-r--r-- | sysdeps/htl/pthread-functions.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/libpthread.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 |
7 files changed, 4 insertions, 11 deletions
diff --git a/htl/Makefile b/htl/Makefile index 7d705835de..0318d81166 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -29,7 +29,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-attr-getschedpolicy pt-attr-getscope \ pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize \ - pt-attr-setinheritsched pt-attr-setschedparam \ + pt-attr-setschedparam \ pt-attr-setschedpolicy pt-attr-setscope pt-attr-setstack \ pt-attr-setstackaddr pt-attr-setstacksize \ \ @@ -165,7 +165,8 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \ - pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched + pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched \ + pt-attr-setinheritsched shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index cd1ab1597c..854ccceeff 100644 --- a/htl/Versions +++ b/htl/Versions @@ -71,7 +71,7 @@ libpthread { pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate; - pthread_attr_setguardsize; pthread_attr_setinheritsched; + pthread_attr_setguardsize; pthread_attr_setschedparam; pthread_attr_setschedpolicy; pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr; pthread_attr_setstacksize; diff --git a/htl/forward.c b/htl/forward.c index 38b2fcc996..adc64e87ad 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -63,9 +63,6 @@ FORWARD (pthread_attr_getdetachstate, FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), (attr, detachstate), 0) -FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit), - (attr, inherit), 0) - FORWARD (pthread_attr_setschedparam, (pthread_attr_t *attr, const struct sched_param *param), (attr, param), 0) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index a036aed894..01da6dae01 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -31,7 +31,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_init = __pthread_attr_init, .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, - .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy, .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 621b97cf05..4054d06918 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -25,7 +25,6 @@ int __pthread_attr_destroy (pthread_attr_t *); int __pthread_attr_init (pthread_attr_t *); int __pthread_attr_getdetachstate (const pthread_attr_t *, int *); int __pthread_attr_setdetachstate (pthread_attr_t *, int); -int __pthread_attr_setinheritsched (pthread_attr_t *, int); int __pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); int __pthread_attr_getschedpolicy (const pthread_attr_t *, int *); @@ -73,7 +72,6 @@ struct pthread_functions int (*ptr_pthread_attr_init) (pthread_attr_t *); int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); - int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int); int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *, const struct sched_param *); int (*ptr_pthread_attr_getschedpolicy) (const pthread_attr_t *, int *); diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index d542029ac4..dae5c433d5 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -33,7 +33,6 @@ GLIBC_2.12 pthread_attr_getstacksize F GLIBC_2.12 pthread_attr_init F GLIBC_2.12 pthread_attr_setdetachstate F GLIBC_2.12 pthread_attr_setguardsize F -GLIBC_2.12 pthread_attr_setinheritsched F GLIBC_2.12 pthread_attr_setschedparam F GLIBC_2.12 pthread_attr_setschedpolicy F GLIBC_2.12 pthread_attr_setscope F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 88e3b2de14..c227e9569e 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -50,7 +50,6 @@ GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F GLIBC_2.38 pthread_attr_setdetachstate F GLIBC_2.38 pthread_attr_setguardsize F -GLIBC_2.38 pthread_attr_setinheritsched F GLIBC_2.38 pthread_attr_setschedparam F GLIBC_2.38 pthread_attr_setschedpolicy F GLIBC_2.38 pthread_attr_setscope F |