static void *rte_thread_init(void *arg)
{
+ int ret;
struct rte_thread_ctrl_params *params = arg;
void *(*start_routine)(void *) = params->start_routine;
void *routine_arg = params->arg;
- pthread_barrier_wait(¶ms->configured);
+ ret = pthread_barrier_wait(¶ms->configured);
+ if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
return start_routine(routine_arg);
}
const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg)
{
- struct rte_thread_ctrl_params params = {
- .start_routine = start_routine,
- .arg = arg,
- };
+ struct rte_thread_ctrl_params *params;
unsigned int lcore_id;
rte_cpuset_t cpuset;
int cpu_found, ret;
- pthread_barrier_init(¶ms.configured, NULL, 2);
+ params = malloc(sizeof(*params));
+ if (!params)
+ return -ENOMEM;
+
+ params->start_routine = start_routine;
+ params->arg = arg;
+
+ pthread_barrier_init(¶ms->configured, NULL, 2);
- ret = pthread_create(thread, attr, rte_thread_init, (void *)¶ms);
- if (ret != 0)
- return ret;
+ ret = pthread_create(thread, attr, rte_thread_init, (void *)params);
+ if (ret != 0) {
+ free(params);
+ return -ret;
+ }
if (name != NULL) {
ret = rte_thread_setname(*thread, name);
if (ret < 0)
- goto fail;
+ RTE_LOG(DEBUG, EAL,
+ "Cannot set name for ctrl thread\n");
}
cpu_found = 0;
if (ret < 0)
goto fail;
- pthread_barrier_wait(¶ms.configured);
+ ret = pthread_barrier_wait(¶ms->configured);
+ if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
return 0;
fail:
+ if (PTHREAD_BARRIER_SERIAL_THREAD ==
+ pthread_barrier_wait(¶ms->configured)) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
pthread_cancel(*thread);
pthread_join(*thread, NULL);
- return ret;
+ return -ret;
}