the function eal_thread_set_affinity always sets the affinity of the
thread to the lcore_id of the thread as given by the thread-local
variable. To allow this function to be used by arbitrary threads
(e.g. eal utility threads such as those for interrupts, timers, etc.),
add a parameter to specify the core id to be used for the affinity.
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
lib/librte_eal/bsdapp/eal/eal_thread.c | 10 +++++-----
lib/librte_eal/linuxapp/eal/eal_thread.c | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c
b/lib/librte_eal/bsdapp/eal/eal_thread.c
index ab05368..18df2a3 100644
--- a/lib/librte_eal/bsdapp/eal/eal_thread.c
+++ b/lib/librte_eal/bsdapp/eal/eal_thread.c
@@ -96,7 +96,7 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned
slave_id)
/* set affinity for current thread */
static int
-eal_thread_set_affinity(void)
+eal_thread_set_affinity(unsigned lcore_id)
{
int s;
pthread_t thread;
@@ -126,7 +126,7 @@ eal_thread_set_affinity(void)
size = CPU_ALLOC_SIZE(RTE_MAX_LCORE);
CPU_ZERO_S(size, cpusetp);
- CPU_SET_S(rte_lcore_id(), size, cpusetp);
+ CPU_SET_S(lcore_id, size, cpusetp);
thread = pthread_self();
s = pthread_setaffinity_np(thread, size, cpusetp);
@@ -140,7 +140,7 @@ eal_thread_set_affinity(void)
#else /* CPU_ALLOC */
cpuset_t cpuset;
CPU_ZERO( &cpuset );
- CPU_SET( rte_lcore_id(), &cpuset );
+ CPU_SET(lcore_id, &cpuset );
thread = pthread_self();
s = pthread_setaffinity_np(thread, sizeof( cpuset ), &cpuset);
@@ -158,7 +158,7 @@ void eal_thread_init_master(unsigned lcore_id)
RTE_PER_LCORE(_lcore_id) = lcore_id;
/* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
+ if (eal_thread_set_affinity(lcore_id) < 0)
rte_panic("cannot set affinity\n");
}
@@ -192,7 +192,7 @@ eal_thread_loop(__attribute__((unused)) void *arg)
RTE_PER_LCORE(_lcore_id) = lcore_id;
/* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
+ if (eal_thread_set_affinity(lcore_id) < 0)
rte_panic("cannot set affinity\n");
/* read on our pipe to get commands */
diff --git a/lib/librte_eal/linuxapp/eal/eal_thread.c
b/lib/librte_eal/linuxapp/eal/eal_thread.c
index 80a985f..9dc3f98 100644
--- a/lib/librte_eal/linuxapp/eal/eal_thread.c
+++ b/lib/librte_eal/linuxapp/eal/eal_thread.c
@@ -96,7 +96,7 @@ rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned
slave_id)
/* set affinity for current thread */
static int
-eal_thread_set_affinity(void)
+eal_thread_set_affinity(unsigned lcore_id)
{
int s;
pthread_t thread;
@@ -126,7 +126,7 @@ eal_thread_set_affinity(void)
size = CPU_ALLOC_SIZE(RTE_MAX_LCORE);
CPU_ZERO_S(size, cpusetp);
- CPU_SET_S(rte_lcore_id(), size, cpusetp);
+ CPU_SET_S(lcore_id, size, cpusetp);
thread = pthread_self();
s = pthread_setaffinity_np(thread, size, cpusetp);
@@ -140,7 +140,7 @@ eal_thread_set_affinity(void)
#else /* CPU_ALLOC */
cpu_set_t cpuset;
CPU_ZERO( &cpuset );
- CPU_SET( rte_lcore_id(), &cpuset );
+ CPU_SET(lcore_id, &cpuset);
thread = pthread_self();
s = pthread_setaffinity_np(thread, sizeof( cpuset ), &cpuset);
@@ -158,7 +158,7 @@ void eal_thread_init_master(unsigned lcore_id)
RTE_PER_LCORE(_lcore_id) = lcore_id;
/* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
+ if (eal_thread_set_affinity(lcore_id) < 0)
rte_panic("cannot set affinity\n");
}
@@ -192,7 +192,7 @@ eal_thread_loop(__attribute__((unused)) void *arg)
RTE_PER_LCORE(_lcore_id) = lcore_id;
/* set CPU affinity */
- if (eal_thread_set_affinity() < 0)
+ if (eal_thread_set_affinity(lcore_id) < 0)
rte_panic("cannot set affinity\n");
/* read on our pipe to get commands */
--
1.9.3
