From patchwork Fri Jan 22 18:24:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 60174 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp13808lbb; Fri, 22 Jan 2016 10:25:22 -0800 (PST) X-Received: by 10.140.178.18 with SMTP id y18mr5693402qhy.92.1453487122539; Fri, 22 Jan 2016 10:25:22 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h13si8297189qge.46.2016.01.22.10.25.21; Fri, 22 Jan 2016 10:25:22 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EAABE617AA; Fri, 22 Jan 2016 18:25:20 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=HE0bIU8Q; dkim-adsp=none (unprotected policy); dkim-atps=neutral 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.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, 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 51B50618E3; Fri, 22 Jan 2016 18:24:29 +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 14517617AB; Fri, 22 Jan 2016 18:24:26 +0000 (UTC) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by lists.linaro.org (Postfix) with ESMTPS id 23E4E617AA for ; Fri, 22 Jan 2016 18:24:25 +0000 (UTC) Received: by mail-wm0-f48.google.com with SMTP id 123so24844510wmz.0 for ; Fri, 22 Jan 2016 10:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I54/Z2aYAsfheK+8Kqit9pLMuckHdIJiblSSeQWUGGs=; b=HE0bIU8QZiRF3lsIy3QT5s34O+I3Ktliy8F81C6yc7tVqUoM+8YBI4LAAZ0MZpyHWV owh/XjZP3jJ9PGRDLn6q+z/tTmBmnPBd2pedmpUt5qbicsjaxzds4f/mu7uYe9MePrb9 M8SHvcac8FDqt148Hkjn+qgVTe7uHK2eYUiDg= 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=I54/Z2aYAsfheK+8Kqit9pLMuckHdIJiblSSeQWUGGs=; b=VgR9tZ4yWrDudQv7Un79v0R9FYqtxcGaNkiAk+m7cf/EJepmchC+W9i2R9uvhSrtrB b/5P3H6CEa1Tt0V6igC6wkQcsUaWgrYrogS2TIs4EJ9iktqiICVg7PQqn7yR8a3UfDwk Wp76dO2HfVIzjMo0qvMDeAwt5e7kcwowqw5vqB2rc+HEzttXIh4wzcYbCPG84iHDL1Ty +qJYu1hI5UyhmXWboh2YmP2lLDlDqUBeWrKgXtklGBvQarcnsiEh4XK+WAuAz/VPu/ij pdPxGJEBgaEBbbdXkKMdW5v0EbemTpP4E1MW11JLnPNb0Dwvxq3roBpAP1Nm8cpySocB QXng== X-Gm-Message-State: AG10YOQ2W3vIMHoKICldWJR0/THaBboX8biaomJQKfnJzzatOZUQJ7w/QMq1YQyVM+t7klxl3k8= X-Received: by 10.194.241.228 with SMTP id wl4mr4668119wjc.11.1453487064279; Fri, 22 Jan 2016 10:24:24 -0800 (PST) Received: from localhost.localdomain ([195.11.233.227]) by smtp.googlemail.com with ESMTPSA id z127sm4031879wme.2.2016.01.22.10.24.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Jan 2016 10:24:23 -0800 (PST) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Fri, 22 Jan 2016 18:24:10 +0000 Message-Id: <1453487050-10913-3-git-send-email-zoltan.kiss@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453487050-10913-1-git-send-email-zoltan.kiss@linaro.org> References: <1453487050-10913-1-git-send-email-zoltan.kiss@linaro.org> X-Topics: timers patch Cc: Ola.Liljedahl@arm.com, petri.savolainen@nokia.com Subject: [lng-odp] [API-NEXT PATCH 2/2] validation: timer: don't utilize pool enirely 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" As per-thread caches might retain some elements, no particular thread should assume that a certain amount of elements are available at any time. Also, we can't reliable check the high watermark anymore. Signed-off-by: Zoltan Kiss --- test/validation/timer/timer.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c index 5d89700..e9f2a90 100644 --- a/test/validation/timer/timer.c +++ b/test/validation/timer/timer.c @@ -274,7 +274,7 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) static void *worker_entrypoint(void *arg TEST_UNUSED) { int thr = odp_thread_id(); - uint32_t i; + uint32_t i, allocated; unsigned seed = thr; int rc; @@ -291,20 +291,28 @@ static void *worker_entrypoint(void *arg TEST_UNUSED) /* Prepare all timers */ for (i = 0; i < NTIMERS; i++) { tt[i].tim = odp_timer_alloc(tp, queue, &tt[i]); - if (tt[i].tim == ODP_TIMER_INVALID) - CU_FAIL_FATAL("Failed to allocate timer"); + if (tt[i].tim == ODP_TIMER_INVALID) { + LOG_DBG("Failed to allocate timer (%d/%d)\n", + i, NTIMERS); + break; + } tt[i].ev = odp_timeout_to_event(odp_timeout_alloc(tbp)); - if (tt[i].ev == ODP_EVENT_INVALID) - CU_FAIL_FATAL("Failed to allocate timeout"); + if (tt[i].ev == ODP_EVENT_INVALID) { + LOG_DBG("Failed to allocate timeout (%d/%d)\n", + i, NTIMERS); + odp_timer_free(tt[i].tim); + break; + } tt[i].ev2 = tt[i].ev; tt[i].tick = TICK_INVALID; } + allocated = i; odp_barrier_wait(&test_barrier); /* Initial set all timers with a random expiration time */ uint32_t nset = 0; - for (i = 0; i < NTIMERS; i++) { + for (i = 0; i < allocated; i++) { uint64_t tck = odp_timer_current_tick(tp) + 1 + odp_timer_ns_to_tick(tp, (rand_r(&seed) % RANGE_MS) @@ -336,7 +344,7 @@ static void *worker_entrypoint(void *arg TEST_UNUSED) nrcv++; } prev_tick = odp_timer_current_tick(tp); - i = rand_r(&seed) % NTIMERS; + i = rand_r(&seed) % allocated; if (tt[i].ev == ODP_EVENT_INVALID && (rand_r(&seed) % 2 == 0)) { /* Timer active, cancel it */ @@ -384,7 +392,7 @@ static void *worker_entrypoint(void *arg TEST_UNUSED) /* Cancel and free all timers */ uint32_t nstale = 0; - for (i = 0; i < NTIMERS; i++) { + for (i = 0; i < allocated; i++) { (void)odp_timer_cancel(tt[i].tim, &tt[i].ev); tt[i].tick = TICK_INVALID; if (tt[i].ev == ODP_EVENT_INVALID) @@ -428,7 +436,7 @@ static void *worker_entrypoint(void *arg TEST_UNUSED) rc = odp_queue_destroy(queue); CU_ASSERT(rc == 0); - for (i = 0; i < NTIMERS; i++) { + for (i = 0; i < allocated; i++) { if (tt[i].ev != ODP_EVENT_INVALID) odp_event_free(tt[i].ev); } @@ -520,7 +528,6 @@ void timer_test_odp_timer_all(void) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(tpinfo.param.num_timers == (unsigned)num_workers * NTIMERS); CU_ASSERT(tpinfo.cur_timers == 0); - CU_ASSERT(tpinfo.hwm_timers == (unsigned)num_workers * NTIMERS); /* Destroy timer pool, all timers must have been freed */ odp_timer_pool_destroy(tp);