From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 217D9A00C2;
Thu, 6 Oct 2022 10:17:42 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0F1FC42B88;
Thu, 6 Oct 2022 10:17:42 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id 3334141153;
Thu, 6 Oct 2022 10:17:40 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1665044260; x=1696580260;
h=from:to:cc:subject:date:message-id:mime-version:
content-transfer-encoding;
bh=6OpCOor1a0TwkLlAks3Ei3qV5MccDBpgpDnAqNDLzoU=;
b=frahq3jHM0cNOpb/SBxcVxu3+ZetIibLS2OZ30yCgKlKVYi9kAdunPTS
2IVc9nzL2CkKe8XgOHwRE9XH1HcXpssFawKqMQa41DFcEjl85nwPX1E1T
MI8SGbUzLWGD6ryro+V89K2NuuLA7qTFV2ckR7UYWzmn5K6NwM/cmPe3M
sk0xPa5GZVIzuk7qcLrsKpS+WnjoNQCEYjXjUR1as83MTUWtVz0xf4BE4
JGogsCuLo6xSnmmrA2sTy6GAdMRoIWTMu5BiHG9NanzCoKIY6oMduBMHW
j4KOvCnvQtVxyIFdxtpzhJhx3+JlMc94Qo3ByUt0kHQfty7cpvrD1FPPp g==;
X-IronPort-AV: E=McAfee;i="6500,9779,10491"; a="300982339"
X-IronPort-AV: E=Sophos;i="5.95,163,1661842800"; d="scan'208";a="300982339"
Received: from orsmga002.jf.intel.com ([10.7.209.21])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
06 Oct 2022 01:17:39 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6500,9779,10491"; a="624636978"
X-IronPort-AV: E=Sophos;i="5.95,163,1661842800"; d="scan'208";a="624636978"
Received: from silpixa00401454.ir.intel.com ([10.55.128.131])
by orsmga002.jf.intel.com with ESMTP; 06 Oct 2022 01:17:36 -0700
From: Harry van Haaren <harry.van.haaren@intel.com>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, dpdklab@iol.unh.edu, ci@dpdk.org,
Honnappa.Nagarahalli@arm.com, mb@smartsharesystems.com,
mattias.ronnblom@ericsson.com, thomas@monjalon.net,
Harry van Haaren <harry.van.haaren@intel.com>
Subject: [PATCH] test/service: fix spurious failures by extending timeout
Date: Thu, 6 Oct 2022 08:17:29 +0000
Message-Id: <20221006081729.578475-1-harry.van.haaren@intel.com>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
This commit extends the timeout for service_may_be_active()
from 100ms to 1000ms. Local testing on a idle and loaded system
(compiling DPDK with all cores) always completes after 1 ms.
The same timeout waiting code was duplicated in two tests, and
is now refactored to a standalone function avoiding duplication.
Reported-by: David Marchand <david.marchand@redhat.com>
Suggested-by: Mattias Ronnblom <mattias.ronnblom@ericsson.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
app/test/test_service_cores.c | 43 ++++++++++++++++-------------------
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
index 359b6dcd8b..5260e078c4 100644
--- a/app/test/test_service_cores.c
+++ b/app/test/test_service_cores.c
@@ -921,12 +921,26 @@ service_lcore_start_stop(void)
return unregister_all();
}
+static int
+service_ensure_stopped_with_timeout(uint32_t sid)
+{
+ /* give the service time to stop running */
+ int32_t timeout_ms = 1000;
+ int i;
+ for (i = 0; i < timeout_ms; i++) {
+ if (!rte_service_may_be_active(sid))
+ break;
+ rte_delay_ms(SERVICE_DELAY);
+ }
+
+ return rte_service_may_be_active(sid);
+}
+
/* stop a service and wait for it to become inactive */
static int
service_may_be_active(void)
{
const uint32_t sid = 0;
- int i;
/* expected failure cases */
TEST_ASSERT_EQUAL(-EINVAL, rte_service_may_be_active(10000),
@@ -946,19 +960,11 @@ service_may_be_active(void)
TEST_ASSERT_EQUAL(1, service_lcore_running_check(),
"Service core expected to poll service but it didn't");
- /* stop the service */
+ /* stop the service, and wait for not-active with timeout */
TEST_ASSERT_EQUAL(0, rte_service_runstate_set(sid, 0),
"Error: Service stop returned non-zero");
-
- /* give the service 100ms to stop running */
- for (i = 0; i < 100; i++) {
- if (!rte_service_may_be_active(sid))
- break;
- rte_delay_ms(SERVICE_DELAY);
- }
-
- TEST_ASSERT_EQUAL(0, rte_service_may_be_active(sid),
- "Error: Service not stopped after 100ms");
+ TEST_ASSERT_EQUAL(0, service_ensure_stopped_with_timeout(sid),
+ "Error: Service not stopped after timeout period.");
return unregister_all();
}
@@ -972,7 +978,6 @@ service_active_two_cores(void)
return TEST_SKIPPED;
const uint32_t sid = 0;
- int i;
uint32_t lcore = rte_get_next_lcore(/* start core */ -1,
/* skip main */ 1,
@@ -1002,16 +1007,8 @@ service_active_two_cores(void)
/* stop the service */
TEST_ASSERT_EQUAL(0, rte_service_runstate_set(sid, 0),
"Error: Service stop returned non-zero");
-
- /* give the service 100ms to stop running */
- for (i = 0; i < 100; i++) {
- if (!rte_service_may_be_active(sid))
- break;
- rte_delay_ms(SERVICE_DELAY);
- }
-
- TEST_ASSERT_EQUAL(0, rte_service_may_be_active(sid),
- "Error: Service not stopped after 100ms");
+ TEST_ASSERT_EQUAL(0, service_ensure_stopped_with_timeout(sid),
+ "Error: Service not stopped after timeout period.");
return unregister_all();
}
--
2.34.1