git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal: implement device iteration initialization
[dpdk.git]
/
lib
/
librte_eal
/
common
/
eal_common_thread.c
diff --git
a/lib/librte_eal/common/eal_common_thread.c
b/lib/librte_eal/common/eal_common_thread.c
index
de69452
..
48ef4d6
100644
(file)
--- a/
lib/librte_eal/common/eal_common_thread.c
+++ b/
lib/librte_eal/common/eal_common_thread.c
@@
-149,11
+149,16
@@
struct rte_thread_ctrl_params {
static void *rte_thread_init(void *arg)
{
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;
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);
}
return start_routine(routine_arg);
}
@@
-170,7
+175,7
@@
rte_ctrl_thread_create(pthread_t *thread, const char *name,
params = malloc(sizeof(*params));
if (!params)
params = malloc(sizeof(*params));
if (!params)
- return -
1
;
+ return -
ENOMEM
;
params->start_routine = start_routine;
params->arg = arg;
params->start_routine = start_routine;
params->arg = arg;
@@
-178,13
+183,16
@@
rte_ctrl_thread_create(pthread_t *thread, const char *name,
pthread_barrier_init(¶ms->configured, NULL, 2);
ret = pthread_create(thread, attr, rte_thread_init, (void *)params);
pthread_barrier_init(¶ms->configured, NULL, 2);
ret = pthread_create(thread, attr, rte_thread_init, (void *)params);
- if (ret != 0)
- return ret;
+ if (ret != 0) {
+ free(params);
+ return -ret;
+ }
if (name != NULL) {
ret = rte_thread_setname(*thread, name);
if (ret < 0)
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;
}
cpu_found = 0;
@@
-204,14
+212,21
@@
rte_ctrl_thread_create(pthread_t *thread, const char *name,
if (ret < 0)
goto fail;
if (ret < 0)
goto fail;
- pthread_barrier_wait(¶ms->configured);
- free(params);
+ ret = pthread_barrier_wait(¶ms->configured);
+ if (ret == PTHREAD_BARRIER_SERIAL_THREAD) {
+ pthread_barrier_destroy(¶ms->configured);
+ free(params);
+ }
return 0;
fail:
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);
pthread_cancel(*thread);
pthread_join(*thread, NULL);
- free(params);
- return ret;
+ return -ret;
}
}