[hurd,commited,03/10] htl: move pthread_setschedparam into libc

Message ID 20230823235546.3391381-4-samuel.thibault@ens-lyon.org
State Committed
Commit 3caa6362d087e68ec864a08fc065ab0e72d29d71
Headers
Series htl: move some forward symbol into libc |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_check--master-arm fail Patch failed to apply

Commit Message

Samuel Thibault Aug. 23, 2023, 11:55 p.m. UTC
  From: Guy-Fleury Iteriteka via Libc-alpha <libc-alpha@sourceware.org>

Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
Message-Id: <20230716084414.107245-4-gfleury@disroot.org>
---
 htl/Makefile                                | 4 ++--
 htl/Versions                                | 2 +-
 htl/forward.c                               | 5 -----
 htl/pt-initialize.c                         | 1 -
 sysdeps/htl/pthread-functions.h             | 4 ----
 sysdeps/mach/hurd/i386/libpthread.abilist   | 1 -
 sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
 7 files changed, 3 insertions(+), 15 deletions(-)
  

Patch

diff --git a/htl/Makefile b/htl/Makefile
index 9362a58393..228c689593 100644
--- 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 f376bf2f18..89d9d347a5 100644
--- 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 df0d4ecc65..5a22c07d08 100644
--- 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 7fc066041d..fae5de4a82 100644
--- 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 89d90dc49b..76bf143234 100644
--- 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 241976e8ef..421d19a3ec 100644
--- 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 8f2d287d56..c8097e5819 100644
--- 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