From patchwork Mon Jan 15 00: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: 124453 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504029lje; Sun, 14 Jan 2018 16:09:26 -0800 (PST) X-Google-Smtp-Source: ACJfBot7vc00wCwxjeGSnLFKmf11mUArInT2zM7Pm8kJkhvC4MJ0Y2jjc0AHYS/4zsNrrvZaX9DI X-Received: by 10.200.58.36 with SMTP id w33mr3622100qte.76.1515974966532; Sun, 14 Jan 2018 16:09:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515974966; cv=none; d=google.com; s=arc-20160816; b=eTkkQoDqowQDLKZTbkmSPUw9bWFKBKxFBZwnWltTuSuY7Y8IY0DQ/vzkVy9xuc5TiQ UaDTO/G9TrKFdKLuvq7oBKlnZcTwJnzK0vEBMArx4+tTnFuoLTVoZYNfzkJ5ioBmchLx z77Ws9fXYajsB8i1sh8Hjr5wTVYVYlBE/5Twdo9GEDWXY6vq8rEXDdrkV22s4296lfDO 8K93/45pelgy/yEr5en7Ww7kjMDRuczS9wshK30VDzf3CJj4/VehPAMKHBZiwBympQPX zQojlQPDKxalvE4uyacfMor+t6Gwbao43HlFUtTKP6zUBHLCHWf+z0cueZfQIiKJNHaZ Itig== 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=KDHmTKcGPZhhJOCt40CONe+uQlB9Bf0WKz3C/L78lIg=; b=yP6hhGNRZM4mtMr0OkIoVwG5+Gd4UuuzEjKWQ/sgCiY1mQHIOi8WfMdKJOJXq2Auk+ P03aGUFipKfWZnjBLxPGolay217rt2PY8EnFKe9dmNTZI31nLRu/UFJaD/IZP/t0TSRa WIR+dQ2XhiD7nzp61MP+0pD+F6ujAjWfjfwh0fG6HpBODoTMfKoPTzpk2v+E3fK8SVdS n3HEfs6SKu2uyeDb4dgY9ndj9ODTuD2+lKsKCrXPdl8EecjvVzxo2R63Ho5Tb1XWGgot /n9d1lHx5hwaF8imA9+lJfzUkyXehq0syqrwIYqJKlZ8BMQZZ3ngMFyjfa04Iw56lAtx NE9g== 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 e4si1970692qth.119.2018.01.14.16.09.26; Sun, 14 Jan 2018 16:09:26 -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 20FDE61749; Mon, 15 Jan 2018 00:09:26 +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 CB6A161777; Mon, 15 Jan 2018 00:04:24 +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 CEEA76177E; Mon, 15 Jan 2018 00:04:19 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 2610E6174E for ; Mon, 15 Jan 2018 00:02:36 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward102p.mail.yandex.net (Yandex) with ESMTP id A19C3430312A for ; Mon, 15 Jan 2018 03:02:34 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Lm9bkMfO84-2Y6Sp7uF; Mon, 15 Jan 2018 03:02:34 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-2ReWjgl2; Mon, 15 Jan 2018 03:02:27 +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: Mon, 15 Jan 2018 03:00:08 +0300 Message-Id: <1515974412-25863-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 10/14] validation: time: use clock_gettime() instead of clock() 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 ODP test for time API uses clock() to compare time against. However clock() returns processor time used by program, which can differ between runs. Use clock_gettime() as a time source to compare against. Signed-off-by: Dmitry Eremin-Solenikov Fixes: https://bugs.linaro.org/show_bug.cgi?id=3572 --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/validation/api/time/time.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index c8f90dbac..d7d5b790e 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -423,11 +423,12 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) { int i; odp_time_t t1, t2, wait, diff; - clock_t c1, c2; + struct timespec ts1, ts2, tsdiff; double sec_t, sec_c; odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS); - c1 = clock(); + i = clock_gettime(CLOCK_MONOTONIC, &ts1); + CU_ASSERT(i == 0); t1 = time_cur(); wait = odp_time_sum(t1, sec); @@ -436,12 +437,21 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) wait = odp_time_sum(wait, sec); } + i = clock_gettime(CLOCK_MONOTONIC, &ts2); + CU_ASSERT(i == 0); t2 = time_cur(); - c2 = clock(); + + if (ts2.tv_nsec < ts1.tv_nsec) { + tsdiff.tv_nsec = 1000000000L + ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - 1 - ts1.tv_sec; + } else { + tsdiff.tv_nsec = ts2.tv_nsec - ts1.tv_nsec; + tsdiff.tv_sec = ts2.tv_sec - ts1.tv_sec; + } diff = odp_time_diff(t2, t1); sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS; - sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC; + sec_c = ((double)(tsdiff.tv_nsec) / 1000000000L) + tsdiff.tv_sec; /* Check that ODP time is within +-5% of system time */ CU_ASSERT(sec_t < sec_c * 1.05);