From c6ec8f39240a166a7e04a7834a28107b6353b46a Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 8 Mar 2017 10:41:47 -0500 Subject: [PATCH] Change dpdk input node fixed-sleep units to usec Change-Id: I94e8737cad9222d24602db4ad03bf43c12c62b79 Signed-off-by: Dave Barach --- src/plugins/dpdk/device/dpdk.h | 4 ++-- src/plugins/dpdk/device/init.c | 2 +- src/plugins/dpdk/device/node.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 2a1a62057c3..092c7dca604 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -380,8 +380,8 @@ typedef struct f64 link_state_poll_interval; f64 stat_poll_interval; - /* Sleep for this many MS after each device poll */ - u32 poll_sleep; + /* Sleep for this many usec after each device poll */ + u32 poll_sleep_usec; /* convenience */ vlib_main_t *vlib_main; diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 0130c0e98bd..85ecde25a23 100755 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1354,7 +1354,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) tmp = format (0, "--no-pci%c", 0); vec_add1 (conf->eal_init_args, tmp); } - else if (unformat (input, "poll-sleep %d", &dm->poll_sleep)) + else if (unformat (input, "poll-sleep %d", &dm->poll_sleep_usec)) ; #define _(a) \ diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index ccbfd2f290a..2120069e6f0 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -533,12 +533,12 @@ static inline void poll_rate_limit (dpdk_main_t * dm) { /* Limit the poll rate by sleeping for N msec between polls */ - if (PREDICT_FALSE (dm->poll_sleep != 0)) + if (PREDICT_FALSE (dm->poll_sleep_usec != 0)) { struct timespec ts, tsrem; ts.tv_sec = 0; - ts.tv_nsec = 1000 * 1000 * dm->poll_sleep; /* 1ms */ + ts.tv_nsec = 1000 * dm->poll_sleep_usec; while (nanosleep (&ts, &tsrem) < 0) { -- 2.16.6