htl: move pthread_attr_setinheritsched into libc

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
Message-Id: <20230716084414.107245-7-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 7d705835de52459f4ad169961f3e3fd6268d80d2..0318d81166d3eaf8cf6ff7e0d995501afa82679e 100644 (file)
--- 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 cd1ab1597cc8e8ea0cd7f3865e19d01a4db89e43..854ccceeff44c33207a3584e478c837fc5854560 100644 (file)
--- 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 38b2fcc9961b95d9b95725b31cdeb46e8f694f96..adc64e87adc13578b806ee3898a17fc19c2f65de 100644 (file)
--- 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 a036aed89439599e6c454a59f72f3f533990497b..01da6dae012895b289da00a9a8aa23bcd5cf7b3f 100644 (file)
--- 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 621b97cf051025e2837fea57188b7a84dad7a7a8..4054d0691849c8f05d997f485c64f144de65b80e 100644 (file)
--- 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 d542029ac482e44f850b5d042c897681d8f96277..dae5c433d57d2e4780791a68ee60fd606406e9da 100644 (file)
--- 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 88e3b2de144832763d6108cfb55ffbc843aab8fe..c227e9569e400a47131910729455b1baf865b741 100644 (file)
--- 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