From patchwork Fri Jan 16 17:05:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola Liljedahl X-Patchwork-Id: 43260 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AFF6F240BA for ; Fri, 16 Jan 2015 17:06:58 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id k11sf11719258wes.2 for ; Fri, 16 Jan 2015 09:06:58 -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=WyvsPUkW/7deub3S3G/FVorPxR3W4xpxZFpr1AqCd5Y=; b=WbkRXnrWX48cIf0HWOPzd09YydOVhoY76QISDeCpc5OZ5d/cxlXaBSYvGusOvqYpf4 iYEsoTtjDlNbC5DgwtJ/+E9xVx4m+ZqvhOJdty88GxADE1gryKi0R7jHednLaVSrVr12 Sj1yCWJvNc97qjqqV9ApCnJcb/8XXCioDybBe5cGT0CsdUyNXgrkx4bpimFpzHhPLNZ+ +f+D4Nkm43Az7ANzQx+j9nukcNM6Ld0H8/AV51aLc6ntda2qB1PdSk8xNoLc5hfIFVAq bSEREdkxu2iZdvKHhmcFZDunJ90TAGWjuj2DDoW8qKaSwLJNwZoaSub9bnVGfPdC0UiL ap+w== X-Gm-Message-State: ALoCoQm5ZFw1kzXECV672zgwCdx7rKEQeh9v32gbl3r2WyltYhA2Ci+yCwcdomg4vTBH/e7QdvmB X-Received: by 10.181.13.147 with SMTP id ey19mr590079wid.2.1421428018025; Fri, 16 Jan 2015 09:06:58 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.35 with SMTP id p3ls181057lap.49.gmail; Fri, 16 Jan 2015 09:06:57 -0800 (PST) X-Received: by 10.152.29.6 with SMTP id f6mr17032898lah.32.1421428017858; Fri, 16 Jan 2015 09:06:57 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id ny7si3435171lbb.135.2015.01.16.09.06.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Jan 2015 09:06:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id ge10so10214289lab.5 for ; Fri, 16 Jan 2015 09:06:57 -0800 (PST) X-Received: by 10.112.90.170 with SMTP id bx10mr16731847lbb.69.1421428017761; Fri, 16 Jan 2015 09:06:57 -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.9.200 with SMTP id c8csp373787lbb; Fri, 16 Jan 2015 09:06:48 -0800 (PST) X-Received: by 10.224.137.129 with SMTP id w1mr26084370qat.91.1421428007672; Fri, 16 Jan 2015 09:06:47 -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 il3si3752654qab.81.2015.01.16.09.06.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Jan 2015 09:06:47 -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 1YCAM6-000101-1t; Fri, 16 Jan 2015 17:06:42 +0000 Received: from mail-lb0-f169.google.com ([209.85.217.169]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YCALf-0000uu-KP for lng-odp@lists.linaro.org; Fri, 16 Jan 2015 17:06:15 +0000 Received: by mail-lb0-f169.google.com with SMTP id p9so19515004lbv.0 for ; Fri, 16 Jan 2015 09:06:10 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr17024224lbl.25.1421427969966; Fri, 16 Jan 2015 09:06:09 -0800 (PST) Received: from macmini.lan (78-82-118-111.tn.glocalnet.net. [78.82.118.111]) by mx.google.com with ESMTPSA id 1sm1578217lay.40.2015.01.16.09.06.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jan 2015 09:06:09 -0800 (PST) From: Ola Liljedahl To: lng-odp@lists.linaro.org Date: Fri, 16 Jan 2015 18:05:59 +0100 Message-Id: <1421427959-11751-5-git-send-email-ola.liljedahl@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421427959-11751-1-git-send-email-ola.liljedahl@linaro.org> References: <1421427959-11751-1-git-send-email-ola.liljedahl@linaro.org> X-Topics: timers patch Subject: [lng-odp] [PATCHv2 4/4] test: odp_timer.c: cunit cleanup 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.215.46 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 Use CU_ASSERT_FATAL instead of plain assert so to work better with the cunit test framework. Use LOG_DBG instead of printf. Remove some unnecessary printouts. Ensure we run at least one worker thread. Signed-off-by: Ola Liljedahl --- (This document/code contribution attached is provided under the terms of agreement LES-LTM-21309) test/validation/odp_timer.c | 50 ++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c index ce5dcaf..d893646 100644 --- a/test/validation/odp_timer.c +++ b/test/validation/odp_timer.c @@ -10,7 +10,6 @@ /* For rand_r and nanosleep */ #define _POSIX_C_SOURCE 200112L -#include #include #include #include @@ -54,8 +53,7 @@ struct test_timer { /* @private Handle a received (timeout) buffer */ static void handle_tmo(odp_buffer_t buf, bool stale, uint64_t prev_tick) { - /* Use assert() for internal correctness checks of test program */ - assert(buf != ODP_BUFFER_INVALID); + CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); /* Internal error */ if (odp_buffer_type(buf) != ODP_BUFFER_TYPE_TIMEOUT) { /* Not a timeout buffer */ CU_FAIL("Unexpected buffer type received"); @@ -233,14 +231,14 @@ static void *worker_entrypoint(void *arg) CU_FAIL("odp_timer_free"); } - printf("Thread %u: %u timers set\n", thr, nset); - printf("Thread %u: %u timers reset\n", thr, nreset); - printf("Thread %u: %u timers cancelled\n", thr, ncancel); - printf("Thread %u: %u timers reset/cancelled too late\n", - thr, ntoolate); - printf("Thread %u: %u timeouts received\n", thr, nrcv); - printf("Thread %u: %u stale timeout(s) after odp_timer_free()\n", - thr, nstale); + LOG_DBG("Thread %u: %u timers set\n", thr, nset); + LOG_DBG("Thread %u: %u timers reset\n", thr, nreset); + LOG_DBG("Thread %u: %u timers cancelled\n", thr, ncancel); + LOG_DBG("Thread %u: %u timers reset/cancelled too late\n", + thr, ntoolate); + LOG_DBG("Thread %u: %u timeouts received\n", thr, nrcv); + LOG_DBG("Thread %u: %u stale timeout(s) after odp_timer_free()\n", + thr, nstale); /* Delay some more to ensure timeouts for expired timers can be * received */ @@ -264,7 +262,7 @@ static void *worker_entrypoint(void *arg) if (buf != ODP_BUFFER_INVALID) CU_FAIL("Unexpected buffer received"); - printf("Thread %u: exiting\n", thr); + LOG_DBG("Thread %u: exiting\n", thr); return NULL; } @@ -273,9 +271,13 @@ static void test_odp_timer_all(void) { odp_buffer_pool_param_t params; odp_timer_pool_param_t tparam; - /* This is a stressfull test - need to reserve some cpu cycles - * @TODO move to test/performance */ - int num_workers = min(odp_sys_cpu_count()-1, MAX_WORKERS); + /* Reserve at least one core for running other processes so the timer + * test hopefully can run undisturbed and thus get better timing + * results. */ + int num_workers = min(odp_sys_cpu_count() - 1, MAX_WORKERS); + /* On a single-CPU machine run at least one thread */ + if (num_workers < 1) + num_workers = 1; /* Create timeout buffer pools */ params.buf_size = 0; @@ -311,19 +313,11 @@ static void test_odp_timer_all(void) CU_ASSERT(tpinfo.param.res_ns == RES); CU_ASSERT(tpinfo.param.min_tmo == MIN); CU_ASSERT(tpinfo.param.max_tmo == MAX); - printf("Timer pool\n"); - printf("----------\n"); - printf(" name: %s\n", tpinfo.name); - printf(" resolution: %"PRIu64" ns (%"PRIu64" us)\n", - tpinfo.param.res_ns, tpinfo.param.res_ns / 1000); - printf(" min tmo: %"PRIu64" ns\n", tpinfo.param.min_tmo); - printf(" max tmo: %"PRIu64" ns\n", tpinfo.param.max_tmo); - printf("\n"); - - printf("#timers..: %u\n", NTIMERS); - printf("Tmo range: %u ms (%"PRIu64" ticks)\n", RANGE_MS, - odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS)); - printf("\n"); + CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); + + LOG_DBG("#timers..: %u\n", NTIMERS); + LOG_DBG("Tmo range: %u ms (%"PRIu64" ticks)\n", RANGE_MS, + odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS)); uint64_t tick; for (tick = 0; tick < 1000000000000ULL; tick += 1000000ULL) {