From patchwork Wed Nov 6 12:52:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1190383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106683-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="jHQMFu2a"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="N297IE9U"; 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 477RKP27BQz9sPK for ; Wed, 6 Nov 2019 23:53:13 +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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=GINbeknorVnBwQNCIS+35BUUoW5wphI 5NywOfOO5uRPyfJTwEgOZNFyqoUBPwJZ62aYms3Gq9wu7R3BULgiI9rT1jQso4qN HYFnBEQYTnfK6FcpJIDrtRH68qJFl281ujizEM7PLsUIrNUALdfTFbaBSa5xeiN8 jhOZq12kWaY4= 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:subject:date:message-id:in-reply-to :references; s=default; bh=XumTox4khTSQbeIPEpt+EI2g/ow=; b=jHQMF u2aYKMmxuBnpkty5vxj/SPnTUc8CW6OBLBoxpJjmnf/SG0M8KxBZ/mZMfu1H00Nf Aou1GUTfOM/pnRWURfhF4qeB65p7bwjoOBN/QyagcZfTmZ0l/WrS555ns28M9Y6w r2zdh1zAxF/Vn+G/8GTTGJ4jKzev/A3r5OIt0I= Received: (qmail 56734 invoked by alias); 6 Nov 2019 12:52:57 -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 56702 invoked by uid 89); 6 Nov 2019 12:52:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1143, states X-HELO: mail-qt1-f194.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=Lm2bajqT/mICCW4kUqd6sM3NtKsKx7Z8gWerQM2whl8=; b=N297IE9UJ7+4b1Hq0C4/4DkkrWGoYp2IldYbNPzLWJswmvtG9WPYGw2DRcc+UKxe95 kEovXrnjnD9W8DKwFYxibG5ybal6FV5w08JAkrjkW6a4Uj+B3WKcNW6izQABGRb1uQWh H/GRY3zm2LGwjag6k42Z4cyW56NMSgLqyKFGll86DMFOzHnDHD1Nmv3kzkTsV/olR8jN 3ccGmgObmj4uoxhWPRWogs4xZbLb+KAbx5i7rjrabeDuDyH5ztOQj2FuKrxYFJrBtjud qJQ8qVOZpHZwudPHxYPPA6iN18mKqGFMNgMins35+ewbZxskw13dRkcv+V64A+x6ZiwC 4I8A== From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] nptl: Refactor thrd_sleep in terms of clock_nanosleep Date: Wed, 6 Nov 2019 09:52:45 -0300 Message-Id: <20191106125245.28102-3-adhemerval.zanella@linaro.org> In-Reply-To: <20191106125245.28102-1-adhemerval.zanella@linaro.org> References: <20191106125245.28102-1-adhemerval.zanella@linaro.org> Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. --- nptl/thrd_sleep.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/nptl/thrd_sleep.c b/nptl/thrd_sleep.c index 2e185dd748..3f5e307d56 100644 --- a/nptl/thrd_sleep.c +++ b/nptl/thrd_sleep.c @@ -24,16 +24,13 @@ int thrd_sleep (const struct timespec* time_point, struct timespec* remaining) { - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL_CANCEL (nanosleep, err, time_point, remaining); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - { - /* C11 states thrd_sleep function returns -1 if it has been interrupted - by a signal, or a negative value if it fails. */ - ret = INTERNAL_SYSCALL_ERRNO (ret, err); - if (ret == EINTR) - return -1; - return -2; - } - return 0; + int ret = __clock_nanosleep (CLOCK_REALTIME, 0, time_point, remaining); + /* C11 states thrd_sleep function returns -1 if it has been interrupted + by a signal, or a negative value if it fails. */ + switch (ret) + { + case 0: return 0; + case EINTR: return -1; + default: return -2; + } }