From fbf9098c0ca1b68eff4ecea89f8da061d41d4b67 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 28 Jul 2020 13:38:45 -0700 Subject: [PATCH] Revert "thread: add spdk_env_get_primary_core" This reverts commit 6194cb2e15923b3a46054459d3806b816235c86e. It's unclear whether we need to add a new API for the env layer for upcoming work. Nothing currently uses it. When we have a clear need, we can add this back in. Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3561 (master) (cherry picked from commit e12a4f6ec8f5aaeb66572e48e29c142677e465e0) Change-Id: I174276799d650a1365b37a737271a54a796cd455 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3580 Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- include/spdk/env.h | 7 ------- lib/env_dpdk/spdk_env_dpdk.map | 1 - lib/env_dpdk/threads.c | 6 ------ 3 files changed, 14 deletions(-) diff --git a/include/spdk/env.h b/include/spdk/env.h index 9c168aefa..3e2018ac8 100644 --- a/include/spdk/env.h +++ b/include/spdk/env.h @@ -468,13 +468,6 @@ uint32_t spdk_env_get_core_count(void); */ uint32_t spdk_env_get_current_core(void); -/** - * Get the index of the primary dedicated CPU core for this application. - * - * \return the index of the primary dedicated CPU core. - */ -uint32_t spdk_env_get_primary_core(void); - /** * Get the index of the first dedicated CPU core for this application. * diff --git a/lib/env_dpdk/spdk_env_dpdk.map b/lib/env_dpdk/spdk_env_dpdk.map index be2f27feb..a465f0938 100644 --- a/lib/env_dpdk/spdk_env_dpdk.map +++ b/lib/env_dpdk/spdk_env_dpdk.map @@ -33,7 +33,6 @@ spdk_mempool_lookup; spdk_env_get_core_count; spdk_env_get_current_core; - spdk_env_get_primary_core; spdk_env_get_first_core; spdk_env_get_last_core; spdk_env_get_next_core; diff --git a/lib/env_dpdk/threads.c b/lib/env_dpdk/threads.c index 8831b8c38..01c7b8d9f 100644 --- a/lib/env_dpdk/threads.c +++ b/lib/env_dpdk/threads.c @@ -48,12 +48,6 @@ spdk_env_get_current_core(void) return rte_lcore_id(); } -uint32_t -spdk_env_get_primary_core(void) -{ - return rte_get_master_lcore(); -} - uint32_t spdk_env_get_first_core(void) {