From patchwork Sun Feb 18 01:53:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 874838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-90340-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="DxmiKYxe"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zkVKd4Jgdz9sWJ for ; Sun, 18 Feb 2018 12:53:56 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=WMSublA87Y4r8ug73pGkUAvOuM+cPF/a9MZad7pohmffvBKMMhELY Y9EatOtT1UtgnikyzQwZUk02bCFnqADlFQjXsgl3coU7VngP1Bfxu2avGtyyAN8v 3SO5DYTuFT+U3rEBsvQlJbJu23j5zus7RpaoeVmjhpCoAtM2rMCVmM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=2Tl0Ib0R7Y0aLzYKVsFnTfIXY1E=; b=DxmiKYxelNeFuimy7QnOjwsPvju3 lXHafBHnU6LfxTaMxq6kR31S90kTHUusrZYc4S/FShPMXbAjSUwHU/aXLL0SIR00 dMWTMmpEKiOwUTs3JHvpvgwbaKrZH6If4bluQ86afmlUbN6qiAWzQlG3+7Z70EEI W3oG7/sD/oOsEp4= Received: (qmail 32105 invoked by alias); 18 Feb 2018 01:53:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32093 invoked by uid 89); 18 Feb 2018 01:53:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=held X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [PATCH] Move NPTL-specific code to NPTL-specific header Date: Sun, 18 Feb 2018 02:53:41 +0100 Message-Id: <20180218015341.24863-1-samuel.thibault@ens-lyon.org> * sysdeps/pthread/timer_routines.c: Include instead of (thread_attr_compare): Move function to... * sysdeps/nptl/timer_routines.h: ... new header. --- ChangeLog | 4 ++++ sysdeps/nptl/internaltypes.h | 25 +++++++++++++++++++++++++ sysdeps/pthread/timer_routines.c | 27 +-------------------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e8411f9bf..158d4f2474 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ (__ptsname_r): Move implementation to... (__ptsname_internal): ... new function. Add filling the STP structure. + * sysdeps/pthread/timer_routines.c: Include instead + of + (thread_attr_compare): Move function to... + * sysdeps/nptl/timer_routines.h: ... new header. 2018-02-17 John David Anglin diff --git a/sysdeps/nptl/internaltypes.h b/sysdeps/nptl/internaltypes.h index b29239b1dc..f216fc773a 100644 --- a/sysdeps/nptl/internaltypes.h +++ b/sysdeps/nptl/internaltypes.h @@ -41,6 +41,31 @@ struct pthread_attr size_t cpusetsize; }; +/* Compare two pthread_attr_t thread attributes for exact equality. + Returns 1 if they are equal, otherwise zero if they are not equal + or contain illegal values. This version is NPTL-specific for + performance reason. One could use the access functions to get the + values of all the fields of the attribute structure. */ +static inline int +thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right) +{ + struct pthread_attr *ileft = (struct pthread_attr *) left; + struct pthread_attr *iright = (struct pthread_attr *) right; + + return (ileft->flags == iright->flags + && ileft->schedpolicy == iright->schedpolicy + && (ileft->schedparam.sched_priority + == iright->schedparam.sched_priority) + && ileft->guardsize == iright->guardsize + && ileft->stackaddr == iright->stackaddr + && ileft->stacksize == iright->stacksize + && ((ileft->cpuset == NULL && iright->cpuset == NULL) + || (ileft->cpuset != NULL && iright->cpuset != NULL + && ileft->cpusetsize == iright->cpusetsize + && memcmp (ileft->cpuset, iright->cpuset, + ileft->cpusetsize) == 0))); +} + #define ATTR_FLAG_DETACHSTATE 0x0001 #define ATTR_FLAG_NOTINHERITSCHED 0x0002 #define ATTR_FLAG_SCOPEPROCESS 0x0004 diff --git a/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c index f059beb4c5..84861b9557 100644 --- a/sysdeps/pthread/timer_routines.c +++ b/sysdeps/pthread/timer_routines.c @@ -29,7 +29,7 @@ #include #include "posix-timer.h" -#include +#include /* Number of threads used. */ @@ -482,31 +482,6 @@ __timer_thread_wakeup (struct thread_node *thread) } -/* Compare two pthread_attr_t thread attributes for exact equality. - Returns 1 if they are equal, otherwise zero if they are not equal - or contain illegal values. This version is NPTL-specific for - performance reason. One could use the access functions to get the - values of all the fields of the attribute structure. */ -static int -thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right) -{ - struct pthread_attr *ileft = (struct pthread_attr *) left; - struct pthread_attr *iright = (struct pthread_attr *) right; - - return (ileft->flags == iright->flags - && ileft->schedpolicy == iright->schedpolicy - && (ileft->schedparam.sched_priority - == iright->schedparam.sched_priority) - && ileft->guardsize == iright->guardsize - && ileft->stackaddr == iright->stackaddr - && ileft->stacksize == iright->stacksize - && ((ileft->cpuset == NULL && iright->cpuset == NULL) - || (ileft->cpuset != NULL && iright->cpuset != NULL - && ileft->cpusetsize == iright->cpusetsize - && memcmp (ileft->cpuset, iright->cpuset, - ileft->cpusetsize) == 0))); -} - /* Search the list of active threads and find one which has matching attributes. Global mutex lock must be held by caller. */