From 0caab6638e22a301e8aa0b35f790b15aaf0791d9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 7 Oct 2019 15:49:48 +0200 Subject: nptl: Move pthread_attr_getschedparam implementation into libc This is part of the libpthread removal project: Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 4 ++-- nptl/Versions | 2 +- nptl/forward.c | 3 --- nptl/nptl-init.c | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'nptl') diff --git a/nptl/Makefile b/nptl/Makefile index 53c556e503..5ade150b62 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -33,7 +33,7 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \ thrd_equal thrd_sleep thrd_yield pthread_equal \ pthread_attr_destroy pthread_attr_init pthread_attr_getdetachstate \ pthread_attr_setdetachstate pthread_attr_getinheritsched \ - pthread_attr_setinheritsched + pthread_attr_setinheritsched pthread_attr_getschedparam shared-only-routines = forward static-only-routines = pthread_atfork @@ -57,7 +57,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ pthread_getschedparam pthread_setschedparam \ pthread_setschedprio \ pthread_attr_getguardsize pthread_attr_setguardsize \ - pthread_attr_getschedparam pthread_attr_setschedparam \ + pthread_attr_setschedparam \ pthread_attr_getschedpolicy pthread_attr_setschedpolicy \ pthread_attr_getscope pthread_attr_setscope \ pthread_attr_getstackaddr pthread_attr_setstackaddr \ diff --git a/nptl/Versions b/nptl/Versions index 70af2738d2..4fa73bfa00 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -49,7 +49,7 @@ libpthread { pthread_getschedparam; pthread_setschedparam; - pthread_attr_getschedparam; pthread_attr_setschedparam; + pthread_attr_setschedparam; pthread_attr_getschedpolicy; pthread_attr_setschedpolicy; pthread_attr_getscope; pthread_attr_setscope; diff --git a/nptl/forward.c b/nptl/forward.c index 807682cfac..f5e7730026 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -56,9 +56,6 @@ name decl \ FORWARD2 (name, int, decl, params, return defretval) -FORWARD (pthread_attr_getschedparam, - (const pthread_attr_t *attr, struct sched_param *param), - (attr, param), 0) FORWARD (pthread_attr_setschedparam, (pthread_attr_t *attr, const struct sched_param *param), (attr, param), 0) diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 0a317a9572..909668c28a 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -72,7 +72,6 @@ void __nptl_set_robust (struct pthread *); #ifdef SHARED static const struct pthread_functions pthread_functions = { - .ptr_pthread_attr_getschedparam = __pthread_attr_getschedparam, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy, .ptr_pthread_attr_setschedpolicy = __pthread_attr_setschedpolicy, -- cgit 1.4.1