From patchwork Wed Feb 14 16:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 128369 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp758383ljc; Wed, 14 Feb 2018 08:00:29 -0800 (PST) X-Google-Smtp-Source: AH8x227hJY8tKfpZ2QWRXcVQLl8ZEuoUD85ICBl5SRV9eA90G8Ge6syX4q7luLz0pG0+FdvPgw5G X-Received: by 10.55.189.7 with SMTP id n7mr8470913qkf.50.1518624029835; Wed, 14 Feb 2018 08:00:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518624029; cv=none; d=google.com; s=arc-20160816; b=bhyQGbk+v7TxB6Ro14ildrtZ8i9GN/etK432YOuekDDdyN+4vqw1ZhJBbvyl88gq3L Nl//ejh3Fws3VuMbuRtLKisx4xZWIzjERrsG2LCxGFEm+dmVP6xCMF4phVPANHA/0fYN qpTUaTH1NpPJsP9bvMagZ4KxNMQjL8dyAG/TRtwiwfAa/GGBWcaXzihDCDlq1oOkManr NP50AWe6iunnRotyQp3AOtqWPv7G2IP9UW4g8Mien/EIWAunPmf1yoe+q4/9LjLzaZER IRGTJXCtgCVKNd55sMD6Zfc1JgnQigIWO+Jd0gqmD6Hj7Rhf3oQvWRurE3S2GcQTQ0NV 3sAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=BbzrHDhmpwMZufjrXpMM/uaxuqocDI7ZpssBUE0/Ta8=; b=mDdfuajPkyM9V1+tYqup5AJRt0GQmE6ldl5Fk8UUb/v8GaPbKJRgzeDfpgydqHwe6O wD7X8b0+DuQCFL8bc3mnAjlBQQ7aG42I1WPm6GAIyVZvYRpU7zWAzqg4AEmwK3AlcqZ3 /gHIqrFmbFvlQLL2QvrRnSvVdfXwQ5ruuaVweR9LE6SxrDPbGuzFvoE6KyjG+JtyTzhg F2X6T3cAwbzE/U6VQ8I6qaN9a5A+YNpxycaOtoVHC+oeMRSMP6zZIMZv6SYkv0m062o4 6yHSAHaCuiSsUWJKIqVFcPMavmQS2n3XQfYBOk5WpRm5I9MUvtnGz0hp3saRrGW8e8Rw 0HWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id i193si2092077qka.61.2018.02.14.08.00.29; Wed, 14 Feb 2018 08:00:29 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 0E1E661769; Wed, 14 Feb 2018 16:00:29 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 680A7608BD; Wed, 14 Feb 2018 16:00:22 +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 9EDB161798; Wed, 14 Feb 2018 16:00:14 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id B04BF61796 for ; Wed, 14 Feb 2018 16:00:12 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 10CF62A23100 for ; Wed, 14 Feb 2018 19:00:10 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DV35RnH72X-09oSa10V; Wed, 14 Feb 2018 19:00:10 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id gK1YGIrq2b-09pODEJF; Wed, 14 Feb 2018 19:00:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 14 Feb 2018 19:00:08 +0300 Message-Id: <1518624008-19200-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518624008-19200-1-git-send-email-odpbot@yandex.ru> References: <1518624008-19200-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 479 Subject: [lng-odp] [PATCH v1 1/1] validation: timer: fix test failure 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov timer_main test was regularly failing due to worker code receiving timeout events for cancelled timers. I'm fixing worker code to handle these events correctly, however this might signify a loophole in API definition or in linux-generic implementation. Shoud application be able to copy with timers that are cancelled after expiration (but before event reception)? Should implementation mark such timers as non-fresh? Signed-off-by: Dmitry Eremin-Solenikov Fixes: https://bugs.linaro.org/show_bug.cgi?id=3517 --- /** Email created from pull request 479 (lumag:timer-fix) ** https://github.com/Linaro/odp/pull/479 ** Patch: https://github.com/Linaro/odp/pull/479.patch ** Base sha: 41b3fa2cd994a7ef68290a07dcde5564e4640847 ** Merge commit sha: cc3f055117284a00cf82d1ad3d94ae6044701f36 **/ test/validation/api/timer/timer.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c index 7ea508aa0..da2dc05ca 100644 --- a/test/validation/api/timer/timer.c +++ b/test/validation/api/timer/timer.c @@ -282,15 +282,28 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) if (ttp && ttp->tick != TICK_INVALID) CU_FAIL("Stale timeout for active timer"); } else { - if (!odp_timeout_fresh(tmo)) - CU_FAIL("Wrong status (stale) for fresh timeout"); - /* Fresh timeout => local timer must have matching tick */ - if (ttp && ttp->tick != tick) { - LOG_DBG("Wrong tick: expected %" PRIu64 - " actual %" PRIu64 "\n", - ttp->tick, tick); - CU_FAIL("odp_timeout_tick() wrong tick"); + if (ttp && ttp->tick == TICK_INVALID) { + /* Timer was cancelled when it has already expired */ + + if (odp_timeout_fresh(tmo)) + CU_FAIL("Wrong status (fresh) " + "for cancelled timeout"); + } else { + if (!odp_timeout_fresh(tmo)) + CU_FAIL("Wrong status (stale) " + "for fresh timeout"); + + /* Fresh timeout => local timer must have matching tick + */ + if (ttp && ttp->tick != tick) { + LOG_DBG("Wrong tick: expected %" PRIu64 + " actual %" PRIu64 "\n", + ttp->tick, tick); + CU_FAIL("odp_timeout_tick() wrong tick"); + } } + if (ttp && ttp->ev != ODP_EVENT_INVALID) + CU_FAIL("Wrong state for fresh timer (event)"); /* Check that timeout was delivered 'timely' */ if (tick > odp_timer_current_tick(tp)) CU_FAIL("Timeout delivered early"); @@ -401,9 +414,11 @@ static int worker_entrypoint(void *arg TEST_UNUSED) (rand_r(&seed) % 2 == 0)) { /* Timer active, cancel it */ rc = odp_timer_cancel(tt[i].tim, &tt[i].ev); - if (rc != 0) + if (rc != 0) { /* Cancel failed, timer already expired */ ntoolate++; + LOG_DBG("Failed to cancel timer, probably already expired\n"); + } tt[i].tick = TICK_INVALID; ncancel++; } else {