htl: move pthread_setschedparam into libc

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

diff --git a/htl/Makefile b/htl/Makefile
index 9362a58393845b03ea1daf995d29244091a66f43..228c689593bdb3938e1bf1ec2c0e6f94379f8153 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -122,7 +122,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate           \
        pt-kill                                                             \
        pt-getcpuclockid                                                    \
                                                                            \
-       pt-setschedparam pt-setschedprio                                    \
+       pt-setschedprio                                                     \
        pt-yield                                                            \
                                                                            \
        sem_close sem-destroy sem-getvalue sem-init sem_open                \
@@ -165,7 +165,7 @@ headers :=                          \
 distribute :=
 
 routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \
-       pt-getschedparam
+       pt-getschedparam pt-setschedparam
 shared-only-routines = forward
 
 extra-libs := libpthread

diff --git a/htl/Versions b/htl/Versions
index f376bf2f18989943f0d3a2ef44e25738e059d6de..89d9d347a5d7dc3c2dd7a834d16b8909c0593c29 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -126,7 +126,7 @@ libpthread {
     pthread_rwlockattr_init; pthread_rwlockattr_setpshared;
 
     pthread_setcancelstate; pthread_setcanceltype;
-    pthread_setconcurrency; pthread_setschedparam;
+    pthread_setconcurrency;
     pthread_setschedprio; pthread_setspecific;
 
     pthread_sigmask;

diff --git a/htl/forward.c b/htl/forward.c
index df0d4ecc654dc13acca31445fae05ea316161f9a..5a22c07d0881c06e34c1924948f59e165bbb3206 100644 (file)
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -107,11 +107,6 @@ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
                  exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
 
-FORWARD (pthread_setschedparam,
-        (pthread_t target_thread, int policy,
-         const struct sched_param *param), (target_thread, policy, param), 0)
-
-
 FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
 
 FORWARD (pthread_mutex_init,

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 7fc066041d3cde42301ba546800a4d99772b8e82..fae5de4a8283a820dacfa09791cb9cee13397199 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -48,7 +48,6 @@ static const struct pthread_functions pthread_functions = {
   .ptr_pthread_cond_wait = __pthread_cond_wait,
   .ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
   .ptr___pthread_exit = __pthread_exit,
-  .ptr_pthread_setschedparam = __pthread_setschedparam,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
   .ptr_pthread_mutex_init = __pthread_mutex_init,
   .ptr_pthread_mutex_lock = __pthread_mutex_lock,

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 89d90dc49b2e56c79f1fcfb39a8dfa211ee051bb..76bf143234a14575383440cad0a71e27ece3bedf 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -46,8 +46,6 @@ int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
 int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
                             const struct timespec *);
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
-int __pthread_setschedparam (pthread_t, int,
-                           const struct sched_param *);
 int _pthread_mutex_destroy (pthread_mutex_t *);
 int _pthread_mutex_init (pthread_mutex_t *,
                         const pthread_mutexattr_t *);
@@ -99,8 +97,6 @@ struct pthread_functions
   int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
                                     const struct timespec *);
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
-  int (*ptr_pthread_setschedparam) (pthread_t, int,
-                                   const struct sched_param *);
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
                                 const pthread_mutexattr_t *);

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 241976e8ef290ce6e3d6711f8a1b631910b55874..421d19a3ecec5829eb6a861e9a26a5dd4b8e5f54 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -109,7 +109,6 @@ GLIBC_2.12 pthread_rwlockattr_setpshared F
 GLIBC_2.12 pthread_setcancelstate F
 GLIBC_2.12 pthread_setcanceltype F
 GLIBC_2.12 pthread_setconcurrency F
-GLIBC_2.12 pthread_setschedparam F
 GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_setspecific F
 GLIBC_2.12 pthread_sigmask F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 8f2d287d568bde1f54f1b491907a0a6eb52d04f7..c8097e581991ab5e3418c74b3310787264737899 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -139,7 +139,6 @@ GLIBC_2.38 pthread_rwlockattr_setpshared F
 GLIBC_2.38 pthread_setcancelstate F
 GLIBC_2.38 pthread_setcanceltype F
 GLIBC_2.38 pthread_setconcurrency F
-GLIBC_2.38 pthread_setschedparam F
 GLIBC_2.38 pthread_setschedprio F
 GLIBC_2.38 pthread_setspecific F
 GLIBC_2.38 pthread_sigmask F