diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-09-25 14:05:01 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-10-04 15:15:31 +0300 |
| commit | bb3a47d7eb62cfe50b111b357435f8bd554f374f (patch) | |
| tree | 179bf91f93e3c30cf806ca5cce82dc43cfe30896 | |
| parent | 22dcddaa3dcc82f88b4e9b97a6aa6deb632269f6 (diff) | |
linux-gen: dpdk: move dpdk_initialized global var into odp_global_data_rw_t
‘dpdk_initialized’ is modified after global init.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | platform/linux-generic/include/odp_global_data.h | 1 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/dpdk.c | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h index f3ddae418..f1be1502c 100644 --- a/platform/linux-generic/include/odp_global_data.h +++ b/platform/linux-generic/include/odp_global_data.h @@ -68,6 +68,7 @@ struct odp_global_data_rw_t { int inotify_watch_fd; pthread_t inotify_thread; int inotify_pcapng_is_running; + odp_bool_t dpdk_initialized; }; extern struct odp_global_data_ro_t odp_global_ro; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index f1ace71f7..578a94b0e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -139,9 +139,6 @@ static inline pkt_dpdk_t *pkt_priv(pktio_entry_t *pktio_entry) static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ -/* Has dpdk_pktio_init() been called */ -static odp_bool_t dpdk_initialized; - #ifndef RTE_BUILD_SHARED_LIB #define MEMPOOL_OPS(hdl) \ extern void mp_hdlr_init_##hdl(void) @@ -1260,7 +1257,7 @@ static void dpdk_mempool_free(struct rte_mempool *mp, void *arg ODP_UNUSED) static int dpdk_pktio_term(void) { - if (!dpdk_initialized) + if (!odp_global_rw->dpdk_initialized) return 0; #if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0) @@ -1433,9 +1430,9 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, /* Initialize DPDK here instead of odp_init_global() to enable running * 'make check' without root privileges */ - if (dpdk_initialized == 0) { + if (odp_global_rw->dpdk_initialized == 0) { dpdk_pktio_init(); - dpdk_initialized = 1; + odp_global_rw->dpdk_initialized = 1; } /* Init pktio entry */ |