From patchwork Thu Mar 3 23:02:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 63500 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp162333lbc; Thu, 3 Mar 2016 15:04:24 -0800 (PST) X-Received: by 10.140.233.85 with SMTP id e82mr6612579qhc.86.1457046264488; Thu, 03 Mar 2016 15:04:24 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x130si798930qka.101.2016.03.03.15.04.24; Thu, 03 Mar 2016 15:04:24 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 149FC62F4B; Thu, 3 Mar 2016 23:04:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 24A0461C6F; Thu, 3 Mar 2016 23:04:18 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A7918667A6; Thu, 3 Mar 2016 23:04:15 +0000 (UTC) Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com [209.85.192.47]) by lists.linaro.org (Postfix) with ESMTPS id A59CD667AD for ; Thu, 3 Mar 2016 23:03:14 +0000 (UTC) Received: by mail-qg0-f47.google.com with SMTP id w104so30328364qge.1 for ; Thu, 03 Mar 2016 15:03:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6kiGK8mOhG6738YAOlXYptOKFp2atM1Fjj7R9S81n0U=; b=EUqVVhejvTDaEcc8v2DEEIqSNm1rgKCqeBoWlB0O7TI6OnYumuIDjyNq0LAKOsRSkt Gl2hFwqSr/nf0IjouzhVXnk+Mm7QHKYZBpl0YJQ9ROPCsedVH9Nyu2iBqkidMm7mUQfr yI/WAoV7x64XwOSkZR1+QsoaJV0qcxrG7PyMlRoxVceAAZeGGBdEoGihDuGjgKHcKMsu 2BgmTh8Ejt+TrNwJUW50ibvglAoa8vZ268YqY4c/VZIy380gpWwvkSWnn+6dHJcmcvOu ALion0u3G44PftelTo6AYfIPxrHQdW9SFs+svUzSGrZil2ugf2Depn5J0eaFThTYAsuS dw0g== X-Gm-Message-State: AD7BkJKBdHxcTaW75/C9r2SmNk014xVQjtNNHRcjW2dJRgrnRYyf5CyNlKcCKjkJ9rM6grMIpl0= X-Received: by 10.140.249.6 with SMTP id u6mr6867489qhc.83.1457046194460; Thu, 03 Mar 2016 15:03:14 -0800 (PST) Received: from Ubuntu15.localdomain ([64.88.227.134]) by smtp.gmail.com with ESMTPSA id c60sm369404qga.20.2016.03.03.15.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Mar 2016 15:03:13 -0800 (PST) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Thu, 3 Mar 2016 17:02:44 -0600 Message-Id: <1457046165-32539-2-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457046165-32539-1-git-send-email-bill.fischofer@linaro.org> References: <1457046165-32539-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv2 2/3] linux-generic: rwlock: implement trylock variants of rwlock and rwlock_recursive X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_rwlock.c | 14 ++++++++++ platform/linux-generic/odp_rwlock_recursive.c | 37 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index f50fd5f..13c17a2 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -31,6 +31,13 @@ void odp_rwlock_read_lock(odp_rwlock_t *rwlock) } } +int odp_rwlock_read_trylock(odp_rwlock_t *rwlock) +{ + uint32_t zero = 0; + + return odp_atomic_cas_acq_u32(&rwlock->cnt, &zero, (uint32_t)1); +} + void odp_rwlock_read_unlock(odp_rwlock_t *rwlock) { odp_atomic_sub_rel_u32(&rwlock->cnt, 1); @@ -54,6 +61,13 @@ void odp_rwlock_write_lock(odp_rwlock_t *rwlock) } } +int odp_rwlock_write_trylock(odp_rwlock_t *rwlock) +{ + uint32_t zero = 0; + + return odp_atomic_cas_acq_u32(&rwlock->cnt, &zero, (uint32_t)-1); +} + void odp_rwlock_write_unlock(odp_rwlock_t *rwlock) { odp_atomic_store_rel_u32(&rwlock->cnt, 0); diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c index 2338b53..6b02281 100644 --- a/platform/linux-generic/odp_rwlock_recursive.c +++ b/platform/linux-generic/odp_rwlock_recursive.c @@ -31,6 +31,24 @@ void odp_rwlock_recursive_read_lock(odp_rwlock_recursive_t *rlock) rlock->rd_cnt[thr] = 1; } +/* Multiple readers can recurse the lock concurrently */ +int odp_rwlock_recursive_read_trylock(odp_rwlock_recursive_t *rlock) +{ + int thr = odp_thread_id(); + + if (rlock->rd_cnt[thr]) { + rlock->rd_cnt[thr]++; + return 1; + } + + if (odp_rwlock_read_trylock(&rlock->lock)) { + rlock->rd_cnt[thr] = 1; + return 1; + } + + return 0; +} + void odp_rwlock_recursive_read_unlock(odp_rwlock_recursive_t *rlock) { int thr = odp_thread_id(); @@ -58,6 +76,25 @@ void odp_rwlock_recursive_write_lock(odp_rwlock_recursive_t *rlock) rlock->wr_cnt = 1; } +/* Only one writer can recurse the lock */ +int odp_rwlock_recursive_write_trylock(odp_rwlock_recursive_t *rlock) +{ + int thr = odp_thread_id(); + + if (rlock->wr_owner == thr) { + rlock->wr_cnt++; + return 1; + } + + if (odp_rwlock_write_trylock(&rlock->lock)) { + rlock->wr_owner = thr; + rlock->wr_cnt = 1; + return 1; + } + + return 0; +} + void odp_rwlock_recursive_write_unlock(odp_rwlock_recursive_t *rlock) { rlock->wr_cnt--;