From patchwork Wed Aug 23 23:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1825037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RWNQY4ThCz1yZs for ; Thu, 24 Aug 2023 09:56:05 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B3193850214 for ; Wed, 23 Aug 2023 23:56:03 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 91A4F3857712 for ; Wed, 23 Aug 2023 23:55:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 91A4F3857712 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id A0787200F4; Thu, 24 Aug 2023 01:55:49 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GfZhi_gZzzyN; Thu, 24 Aug 2023 01:55:49 +0200 (CEST) Received: from begin (apoitiers-658-1-118-253.w92-162.abo.wanadoo.fr [92.162.65.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id A1D39200FD; Thu, 24 Aug 2023 01:55:48 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1qYxhT-00EEGL-3D; Thu, 24 Aug 2023 01:55:47 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: commit-hurd@gnu.org, Guy-Fleury Iteriteka Subject: [hurd,commited 03/10] htl: move pthread_setschedparam into libc Date: Thu, 24 Aug 2023 01:55:39 +0200 Message-Id: <20230823235546.3391381-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230823235546.3391381-1-samuel.thibault@ens-lyon.org> References: <20230823235546.3391381-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" From: Guy-Fleury Iteriteka via Libc-alpha Signed-off-by: Guy-Fleury Iteriteka 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(-) 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