From patchwork Tue Nov 25 22:37:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola Liljedahl X-Patchwork-Id: 41511 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B2A3725E72 for ; Tue, 25 Nov 2014 22:38:32 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf1205577wib.6 for ; Tue, 25 Nov 2014 14:38:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=QH5Fk3uuGnzh9C1wba4Cjij8bv1hm7dBCv+kn+BswUg=; b=Gaz0T0vz402/FBlgHmPdUlBBU9Nx2TwwyBamN4dx0Nklqq1umWIeL5I2Z1A55JH03O 7wwoa4cSGgiDoCtE064/rHtzmhZpkEEKrdlXnz1PuE8Hq3XW8ZtPDcUmsUolqF0ztZq3 t6xXLe5Jk+RaUatLsRBF016HunZYqI+bPuclqAFYy7nKg7nJsF7Aw2U7Vo3tr13JoOt4 9VhwJb8N94l4wUfLDfKs2sIFE/XEGawWtC8FvWbiKr5I7I7POA3AjeTSFU8Ptt6eJmoO JH0yENky3DoYwlRHRK1jRKxH9nDPji94H8MbaHTVoopKGOD8rVdzUN+laGStEtsd1Xtf erTA== X-Gm-Message-State: ALoCoQlPOe5kN2n1fbzEbrWJn5Y/sXeNSsAf0Z2l0E9AT/821IvDVIrYTjofmnZYdkpvTYrAA+Ia X-Received: by 10.112.204.71 with SMTP id kw7mr1129347lbc.13.1416955111987; Tue, 25 Nov 2014 14:38:31 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.98 with SMTP id d2ls659352lae.19.gmail; Tue, 25 Nov 2014 14:38:31 -0800 (PST) X-Received: by 10.112.141.66 with SMTP id rm2mr6679643lbb.0.1416955111812; Tue, 25 Nov 2014 14:38:31 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id d3si2674142lbc.14.2014.11.25.14.38.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Nov 2014 14:38:31 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so1573872lbj.27 for ; Tue, 25 Nov 2014 14:38:31 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr30408618lbc.23.1416955111690; Tue, 25 Nov 2014 14:38:31 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp532028lbc; Tue, 25 Nov 2014 14:38:30 -0800 (PST) X-Received: by 10.220.178.134 with SMTP id bm6mr16086118vcb.56.1416955110417; Tue, 25 Nov 2014 14:38:30 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id so10si943524vdc.82.2014.11.25.14.38.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Nov 2014 14:38:30 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtOke-00042r-7i; Tue, 25 Nov 2014 22:38:28 +0000 Received: from mail-lb0-f174.google.com ([209.85.217.174]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtOkI-00041P-Qm for lng-odp@lists.linaro.org; Tue, 25 Nov 2014 22:38:06 +0000 Received: by mail-lb0-f174.google.com with SMTP id w7so1447753lbi.19 for ; Tue, 25 Nov 2014 14:38:01 -0800 (PST) X-Received: by 10.152.164.232 with SMTP id yt8mr30731924lab.7.1416955081213; Tue, 25 Nov 2014 14:38:01 -0800 (PST) Received: from macmini.lan (84-217-193-77.tn.glocalnet.net. [84.217.193.77]) by mx.google.com with ESMTPSA id vr7sm696196lbb.21.2014.11.25.14.38.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 14:38:00 -0800 (PST) From: Ola Liljedahl To: lng-odp@lists.linaro.org Date: Tue, 25 Nov 2014 23:37:47 +0100 Message-Id: <1416955068-6580-4-git-send-email-ola.liljedahl@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416955068-6580-1-git-send-email-ola.liljedahl@linaro.org> References: <1416955068-6580-1-git-send-email-ola.liljedahl@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 3/4] linux-generic: odp_rwlock[ch]: use odp_atomic_internal.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: 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-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ola.liljedahl@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Ola Liljedahl --- Use definitions from odp_atomic_internal.h. platform/linux-generic/include/api/odp_rwlock.h | 4 ++- platform/linux-generic/odp_rwlock.c | 35 ++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/platform/linux-generic/include/api/odp_rwlock.h b/platform/linux-generic/include/api/odp_rwlock.h index a880f92..59cf9cc 100644 --- a/platform/linux-generic/include/api/odp_rwlock.h +++ b/platform/linux-generic/include/api/odp_rwlock.h @@ -13,6 +13,8 @@ * ODP RW Locks */ +#include + #ifdef __cplusplus extern "C" { #endif @@ -28,7 +30,7 @@ extern "C" { * read lock count > 0 */ typedef struct { - volatile int32_t cnt; /**< -1 Write lock, + odp_atomic_u32_t cnt; /**< -1 Write lock, > 0 for Read lock. */ } odp_rwlock_t; diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 2f6a255..fc78b20 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -6,64 +6,63 @@ #include #include +#include #include #include void odp_rwlock_init(odp_rwlock_t *rwlock) { - rwlock->cnt = 0; + odp_atomic_init_u32(&rwlock->cnt, 0); } void odp_rwlock_read_lock(odp_rwlock_t *rwlock) { - int32_t cnt; + uint32_t cnt; int is_locked = 0; while (is_locked == 0) { - cnt = rwlock->cnt; + cnt = odp_atomic_u32_load_mm(&rwlock->cnt, ODP_MEMMODEL_RLX); /* waiting for read lock */ - if (cnt < 0) { + if ((int32_t)cnt < 0) { odp_spin(); continue; } - is_locked = __atomic_compare_exchange_n(&rwlock->cnt, + is_locked = odp_atomic_u32_cmp_xchg_strong_mm(&rwlock->cnt, &cnt, cnt + 1, - false/*strong*/, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); + ODP_MEMMODEL_ACQ, + ODP_MEMMODEL_RLX); } } void odp_rwlock_read_unlock(odp_rwlock_t *rwlock) { - (void)__atomic_sub_fetch(&rwlock->cnt, 1, __ATOMIC_RELEASE); + odp_atomic_u32_sub_mm(&rwlock->cnt, 1, ODP_MEMMODEL_RLS); } void odp_rwlock_write_lock(odp_rwlock_t *rwlock) { - int32_t cnt; + uint32_t cnt; int is_locked = 0; while (is_locked == 0) { - int32_t zero = 0; - cnt = rwlock->cnt; + uint32_t zero = 0; + cnt = odp_atomic_u32_load_mm(&rwlock->cnt, ODP_MEMMODEL_RLX); /* lock aquired, wait */ if (cnt != 0) { odp_spin(); continue; } - is_locked = __atomic_compare_exchange_n(&rwlock->cnt, + is_locked = odp_atomic_u32_cmp_xchg_strong_mm(&rwlock->cnt, &zero, - -1, - false/*strong*/, - __ATOMIC_ACQUIRE, - __ATOMIC_RELAXED); + (uint32_t)-1, + ODP_MEMMODEL_ACQ, + ODP_MEMMODEL_RLX); } } void odp_rwlock_write_unlock(odp_rwlock_t *rwlock) { - (void)__atomic_add_fetch(&rwlock->cnt, 1, __ATOMIC_RELEASE); + odp_atomic_u32_store_mm(&rwlock->cnt, 0, ODP_MEMMODEL_RLS); }