From patchwork Wed Nov 26 02:46:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yan.songming" X-Patchwork-Id: 41513 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 2141125E72 for ; Wed, 26 Nov 2014 02:47:17 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf1378752wib.2 for ; Tue, 25 Nov 2014 18:47:16 -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: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=qatPOakZeyawbS3vEgmMrEtUvJ/zRxx+QoeXk5+SV5w=; b=KEeiGv+1d6urc+9pQCUG1eCbq1Wdu/NZ+mF32rQ1msrLesuMI05v4HM7uQHQIDSYWX CIkaDmjUwImCGIg1SqoMzYJ33SAEEzfrzXqrL6NITeo6T+64FLOv/Az6P1gKnAp8/pCQ XbXwHwqpEVN4tLF9El3xOQGMI3RNCAQyitMKoYyZiGiCMgNz9s4jVZmwdYC/+iiNtIkX xQqvMAVwXSoqV5kIduhZva1U+2VkHrET//ub02A+LN8oqkMqORac/aOobrSnuDdTiEXC r+iw7afngyzDlDUMy7vLhkYpu+4MGLKKABLDwcxXm1tg2S0KMlUXPQRYZ1OfxnhpcnA5 59zQ== X-Gm-Message-State: ALoCoQno/hLwUScxYKf946YLD+cYgr5Y6AuPB5RF3wZjrkGzVkVn93aFa4BQXCAixNpD1Ybmpq56 X-Received: by 10.180.105.97 with SMTP id gl1mr5235713wib.7.1416970036370; Tue, 25 Nov 2014 18:47:16 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.176 with SMTP id az16ls536147lab.87.gmail; Tue, 25 Nov 2014 18:47:15 -0800 (PST) X-Received: by 10.152.205.11 with SMTP id lc11mr31621769lac.34.1416970035699; Tue, 25 Nov 2014 18:47:15 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id v1si1413686lae.56.2014.11.25.18.47.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Nov 2014 18:47:15 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id hs14so1672103lab.22 for ; Tue, 25 Nov 2014 18:47:15 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr8087033lal.29.1416970035486; Tue, 25 Nov 2014 18:47:15 -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 ew9csp558293lbc; Tue, 25 Nov 2014 18:47:14 -0800 (PST) X-Received: by 10.140.98.202 with SMTP id o68mr42060360qge.49.1416970033969; Tue, 25 Nov 2014 18:47:13 -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 64si3559866qgh.48.2014.11.25.18.47.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Nov 2014 18:47:13 -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 1XtSdJ-0005pr-Pq; Wed, 26 Nov 2014 02:47:09 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtSdD-0005p8-IA for lng-odp@lists.linaro.org; Wed, 26 Nov 2014 02:47:03 +0000 Received: by mail-pd0-f182.google.com with SMTP id r10so1841606pdi.13 for ; Tue, 25 Nov 2014 18:46:58 -0800 (PST) X-Received: by 10.68.131.133 with SMTP id om5mr47929536pbb.41.1416970017998; Tue, 25 Nov 2014 18:46:57 -0800 (PST) Received: from localhost.localdomain ([210.51.195.9]) by mx.google.com with ESMTPSA id lm3sm2744504pab.34.2014.11.25.18.46.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Nov 2014 18:46:56 -0800 (PST) From: Yan Sonming To: lng-odp@lists.linaro.org Date: Tue, 25 Nov 2014 21:46:44 -0500 Message-Id: <1416970004-14454-1-git-send-email-yan.songming@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Topics: patch Subject: [lng-odp] [PATCH v3] cunit: add shm test 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: yan.songming@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.215.49 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 Add odp_cunit_common.c for common cunit function and add the cunit test for the api in odp_share_memory.h which include the new api implement odp_shm_free. Signed-off-by: Yan Songming --- v3 change common file to test/common and fix the problem Jerin found. v2 fix some problem which maxim and mike found. --- test/validation/Makefile.am | 7 +- test/validation/common/.dirstamp | 0 test/validation/common/odp_cunit_common.c | 37 ++++++++++ test/validation/common/odp_cunit_common.h | 35 +++++++++ test/validation/odp_shm.c | 119 ++++++++++++++++++++++++++++++ 5 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 test/validation/common/.dirstamp create mode 100644 test/validation/common/odp_cunit_common.c create mode 100644 test/validation/common/odp_cunit_common.h create mode 100644 test/validation/odp_shm.c diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 0b831d0..86200d4 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -6,11 +6,13 @@ AM_LDFLAGS += -L$(CUNIT_PATH)/lib -static -lcunit if ODP_CUNIT_ENABLED TESTS = ${bin_PROGRAMS} check_PROGRAMS = ${bin_PROGRAMS} -bin_PROGRAMS = odp_init odp_queue odp_crypto +bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_init_LDFLAGS = $(AM_LDFLAGS) odp_queue_LDFLAGS = $(AM_LDFLAGS) -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto +odp_crypto_CFLAGS = $(AM_CFLAGS) -I./crypto odp_crypto_LDFLAGS = $(AM_LDFLAGS) +odp_shm_CFLAGS = $(AM_CFLAGS) -I./common +odp_shm_LDFLAGS = $(AM_LDFLAGS) endif dist_odp_init_SOURCES = odp_init.c @@ -18,3 +20,4 @@ dist_odp_queue_SOURCES = odp_queue.c dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ crypto/odp_crypto_test_sync_inp.c \ odp_crypto.c +dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c diff --git a/test/validation/common/.dirstamp b/test/validation/common/.dirstamp new file mode 100644 index 0000000..e69de29 diff --git a/test/validation/common/odp_cunit_common.c b/test/validation/common/odp_cunit_common.c new file mode 100644 index 0000000..885b981 --- /dev/null +++ b/test/validation/common/odp_cunit_common.c @@ -0,0 +1,37 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP test application common + */ + +#include +#include +#include "odp_cunit_common.h" +#include "odph_linux.h" +/* Globals */ +static odph_linux_pthread_t thread_tbl[MAX_WORKERS]; + +/** create test thread */ +int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg) +{ + /* Create and init additional threads */ + odph_linux_pthread_create(thread_tbl, arg->numthrds, 0, func_ptr, + (void *)arg); + + return 0; +} + +/** exit from test thread */ +int odp_cunit_thread_exit(pthrd_arg *arg) +{ + /* Wait for other threads to exit */ + odph_linux_pthread_join(thread_tbl, arg->numthrds); + + return 0; +} diff --git a/test/validation/common/odp_cunit_common.h b/test/validation/common/odp_cunit_common.h new file mode 100644 index 0000000..5eec376 --- /dev/null +++ b/test/validation/common/odp_cunit_common.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP test application common headers + */ + +#ifndef ODP_CUNICT_COMMON_H +#define ODP_CUNICT_COMMON_H + +#define MAX_WORKERS 32 /**< Maximum number of work threads */ + +typedef struct { + uint32_t foo; + uint32_t bar; +} test_shared_data_t; + +/** + * Thread argument + */ +typedef struct { + int testcase; /**< specifies which set of API's to exercise */ + int numthrds; /**< no of pthreads to create */ +} pthrd_arg; + +/** create thread fro start_routine function */ +extern int odp_cunit_thread_create(void *func_ptr(void *), pthrd_arg *arg); +extern int odp_cunit_thread_exit(pthrd_arg *); + +#endif /* ODP_COMMON_H */ diff --git a/test/validation/odp_shm.c b/test/validation/odp_shm.c new file mode 100644 index 0000000..27d260a --- /dev/null +++ b/test/validation/odp_shm.c @@ -0,0 +1,119 @@ +/* Copyright (c) 2014, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "odp.h" +#include "CUnit/Basic.h" +#include "odp_cunit_common.h" + +#define ALIGE_SIZE (128) +#define TESTNAME "cunit_test_shared_data" +#define TEST_SHARE_FOO (0xf0f0f0f0) +#define TEST_SHARE_BAR (0xf0f0f0f) + +static void *run_shm_thread(void *arg) +{ + odp_shm_info_t info; + odp_shm_t shm; + test_shared_data_t *test_shared_data; + int thr; + + thr = odp_thread_id(); + printf("Thread %i starts\n", thr); + + shm = odp_shm_lookup(TESTNAME); + CU_ASSERT(ODP_SHM_INVALID != shm); + test_shared_data = odp_shm_addr(shm); + CU_ASSERT(TEST_SHARE_FOO == test_shared_data->foo); + CU_ASSERT(TEST_SHARE_BAR == test_shared_data->bar); + CU_ASSERT(0 == odp_shm_info(shm, &info)); + CU_ASSERT(0 == strcmp(TESTNAME, info.name)); + CU_ASSERT(0 == info.flags); + CU_ASSERT(test_shared_data == info.addr); + CU_ASSERT(sizeof(test_shared_data_t) == info.size); + CU_ASSERT(odp_sys_page_size() == info.page_size); + odp_shm_print_all(); + + fflush(stdout); + return arg; +} + +static void test_odp_shm_sunnyday(void) +{ + pthrd_arg thrdarg; + odp_shm_t shm; + test_shared_data_t *test_shared_data; + + shm = odp_shm_reserve(TESTNAME, + sizeof(test_shared_data_t), ALIGE_SIZE, 0); + CU_ASSERT(ODP_SHM_INVALID != shm); + + CU_ASSERT(0 == odp_shm_free(shm)); + CU_ASSERT(ODP_SHM_INVALID == odp_shm_lookup(TESTNAME)); + + shm = odp_shm_reserve(TESTNAME, + sizeof(test_shared_data_t), ALIGE_SIZE, 0); + CU_ASSERT(ODP_SHM_INVALID != shm); + + test_shared_data = odp_shm_addr(shm); + CU_ASSERT(NULL != test_shared_data); + test_shared_data->foo = TEST_SHARE_FOO; + test_shared_data->bar = TEST_SHARE_BAR; + + thrdarg.numthrds = odp_sys_core_count(); + + if (thrdarg.numthrds > MAX_WORKERS) + thrdarg.numthrds = MAX_WORKERS; + + odp_cunit_thread_create(run_shm_thread, &thrdarg); + odp_cunit_thread_exit(&thrdarg); +} + +static int finalize(void) +{ + odp_term_local(); + odp_term_global(); + return 0; +} + +static int init(void) +{ + if (0 != odp_init_global(NULL, NULL)) { + printf("odp_init_global fail.\n"); + return -1; + } + if (0 != odp_init_local()) { + printf("odp_init_local fail.\n"); + return -1; + } + return 0; +} + +int main(void) +{ + CU_pSuite ptr_suite; + + /* initialize the CUnit test registry */ + if (CUE_SUCCESS != CU_initialize_registry()) + return CU_get_error(); + + /* add the tests to the shm suite */ + ptr_suite = CU_add_suite(__FILE__, init, finalize); + if (!ptr_suite) { + CU_cleanup_registry(); + return CU_get_error(); + } + + if (NULL == CU_ADD_TEST(ptr_suite, test_odp_shm_sunnyday)) { + CU_cleanup_registry(); + return CU_get_error(); + } + + /* Run all tests using the CUnit Basic interface */ + CU_basic_set_mode(CU_BRM_VERBOSE); + CU_basic_run_tests(); + CU_cleanup_registry(); + return CU_get_error(); +}