From patchwork Tue May 26 22:31:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 476765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 8B9521406AA for ; Wed, 27 May 2015 08:31:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=pmBYzOpJ; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=W1AsWtAPIvljUwgZldHIWcFbV5L364mYY5C9WGsisryt3W 5Edmmoj0T6f/FKyDm8UyltoJLB4YtPdksG0RQnZE/Ir/t+x1V+I9ruc+6EE2xG+U GrPO+MLeD6D6JE/gT60t4RSOxZ69ROpCPc6OWEaJ4g5R0PqSq0jObOfFoZN34= 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:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=gdMkbRMZfaxpuXL9vJzY9cc2sK0=; b=pmBYzOpJdhUolT9Oex/x jIEaZiCoZGmveJLJYXjAm2Tj+sM8FPoI6FdAioqjRyZQA+V2TIOFhgaodVRB2eQy RuIoeo6FPeovzjGbWoyS0NwDmbNkdRTZASBJiu1a+l1xsYUZRl+uayzswFoNJjxe TMdMr+zkDSs04EoV3WnkQ9c= Received: (qmail 36982 invoked by alias); 26 May 2015 22:31:29 -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 36933 invoked by uid 89); 26 May 2015 22:31:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Add NaCl-specific __lll_timedlock_wait. Message-Id: <20150526223124.432552C3A08@topped-with-meat.com> Date: Tue, 26 May 2015 15:31:24 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=KunCpzHTn4k7zeomkF8A:9 a=CjuIK1q_8ugA:10 * sysdeps/nacl/lll_timedlock_wait.c: New file. diff --git a/sysdeps/nacl/lll_timedlock_wait.c b/sysdeps/nacl/lll_timedlock_wait.c new file mode 100644 index 0000000..df951ee --- /dev/null +++ b/sysdeps/nacl/lll_timedlock_wait.c @@ -0,0 +1,52 @@ +/* Timed low level locking for pthread library. NaCl version. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + + +/* This behaves the same as the generic version in nptl/. It's simpler + because it doesn't need to convert an absolute timeout to a relative + one (and back again in the lll_futex_timed_wait macro). */ + +int +__lll_timedlock_wait (int *futex, const struct timespec *abstime, int private) +{ + /* Reject invalid timeouts. */ + if (__glibc_unlikely (abstime->tv_nsec < 0) + || __glibc_unlikely (abstime->tv_nsec >= 1000000000)) + return EINVAL; + + /* Try locking. */ + int result = 0; + while (atomic_exchange_acq (futex, 2) != 0) + { + /* If *futex == 2, wait until woken or timeout. */ + result = __nacl_irt_futex.futex_wait_abs ((volatile int *) futex, 2, + abstime); + if (__glibc_likely (result == 0) + || __glibc_likely (result == ETIMEDOUT)) + break; + assert (result == EAGAIN); + } + + return result; +}