From patchwork Thu Mar 3 23:02:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 63501 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp162530lbc; Thu, 3 Mar 2016 15:04:49 -0800 (PST) X-Received: by 10.140.98.98 with SMTP id n89mr6695108qge.9.1457046289643; Thu, 03 Mar 2016 15:04:49 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f132si859106qkb.7.2016.03.03.15.04.49; Thu, 03 Mar 2016 15:04:49 -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 3B170650B5; Thu, 3 Mar 2016 23:04:49 +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_H3, RCVD_IN_MSPIKE_WL, 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 AAA07650FD; 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 E8DE261BBB; Thu, 3 Mar 2016 23:04:15 +0000 (UTC) Received: from mail-qk0-f174.google.com (mail-qk0-f174.google.com [209.85.220.174]) by lists.linaro.org (Postfix) with ESMTPS id D78CE61BBB for ; Thu, 3 Mar 2016 23:03:21 +0000 (UTC) Received: by mail-qk0-f174.google.com with SMTP id o6so14693589qkc.2 for ; Thu, 03 Mar 2016 15:03:21 -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=rMFvqd6U4A001wc1gfabePZkA6Qg3OyjfAVGSQkfLi0=; b=hTckgHttaAwDGxccOAYaeeaH9g5oHhWfWseqQT/y60PmG/gG0Nqcp//QY04fvp/z8+ PAV8Wsqwn4Ejj3U4d972Aa7ksobMtOxblMNvVZNxy4fW62QFwbcqQwrkjBOJJKzS3dvg UCWI7AALbdgGTf2asfqcK/bvd/OR0xA5XFkioYkRVdOwBDw+iKuYNbfPV+eWlllgyihh 5/6eXpGm/BNjgCkicd5xgQ8If/VBtRS63EtNbht0Bp1A25lGaRRXUgK2zOS5n6bcQhok Gc7FjJ8HKQCBIojqim/xH+JzUMRN0dtxYuoF61pAx0E2kee0+XIMdtH1Cov9CjoZe7Hu 0uYA== X-Gm-Message-State: AD7BkJL4YxSD+Hc3nfCdOCFRfyVyU8vok56iKULUCGPjuKwxTfhvoi8zUAh9P3/wCi4LGeDZb0U= X-Received: by 10.55.40.16 with SMTP id o16mr6631753qkh.45.1457046201597; Thu, 03 Mar 2016 15:03:21 -0800 (PST) Received: from Ubuntu15.localdomain ([64.88.227.134]) by smtp.gmail.com with ESMTPSA id c60sm369404qga.20.2016.03.03.15.03.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Mar 2016 15:03:21 -0800 (PST) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Thu, 3 Mar 2016 17:02:45 -0600 Message-Id: <1457046165-32539-3-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 3/3] validation: rwlock: add tests for new trylock rwlock and rwlock_recursive apis 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 --- test/validation/lock/lock.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/test/validation/lock/lock.c b/test/validation/lock/lock.c index f1f6d69..071d5b6 100644 --- a/test/validation/lock/lock.c +++ b/test/validation/lock/lock.c @@ -254,17 +254,33 @@ static void *ticketlock_api_tests(void *arg UNUSED) static void rwlock_api_test(odp_rwlock_t *rw_lock) { + int rc; + odp_rwlock_init(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 0); */ odp_rwlock_read_lock(rw_lock); + + rc = odp_rwlock_read_trylock(rw_lock); + CU_ASSERT(rc == 0); + rc = odp_rwlock_write_trylock(rw_lock); + CU_ASSERT(rc == 0); + odp_rwlock_read_unlock(rw_lock); + rc = odp_rwlock_read_trylock(rw_lock); + if (rc == 1) + odp_rwlock_read_unlock(rw_lock); + odp_rwlock_write_lock(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 1); */ odp_rwlock_write_unlock(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 0); */ + + rc = odp_rwlock_write_trylock(rw_lock); + if (rc == 1) + odp_rwlock_write_unlock(rw_lock); } static void *rwlock_api_tests(void *arg UNUSED) @@ -288,21 +304,33 @@ static void *rwlock_api_tests(void *arg UNUSED) static void rwlock_recursive_api_test(odp_rwlock_recursive_t *rw_lock) { + int rc; + odp_rwlock_recursive_init(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 0); */ odp_rwlock_recursive_read_lock(rw_lock); odp_rwlock_recursive_read_lock(rw_lock); + rc = odp_rwlock_recursive_read_trylock(rw_lock); + CU_ASSERT(rc == 1); + rc = odp_rwlock_recursive_write_trylock(rw_lock); + CU_ASSERT(rc == 0); odp_rwlock_recursive_read_unlock(rw_lock); odp_rwlock_recursive_read_unlock(rw_lock); + odp_rwlock_recursive_read_unlock(rw_lock); odp_rwlock_recursive_write_lock(rw_lock); odp_rwlock_recursive_write_lock(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 1); */ + rc = odp_rwlock_recursive_read_trylock(rw_lock); + CU_ASSERT(rc == 0); + rc = odp_rwlock_recursive_write_trylock(rw_lock); + CU_ASSERT(rc == 1); odp_rwlock_recursive_write_unlock(rw_lock); odp_rwlock_recursive_write_unlock(rw_lock); + odp_rwlock_recursive_write_unlock(rw_lock); /* CU_ASSERT(odp_rwlock_is_locked(rw_lock) == 0); */ }