Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl: set worker pthread stop key
[vpp.git]
/
src
/
vcl
/
vcl_private.c
diff --git
a/src/vcl/vcl_private.c
b/src/vcl/vcl_private.c
index
ae4498e
..
0b8c2da
100644
(file)
--- a/
src/vcl/vcl_private.c
+++ b/
src/vcl/vcl_private.c
@@
-15,7
+15,7
@@
#include <vcl/vcl_private.h>
#include <vcl/vcl_private.h>
-pthread_key_t vcl_worker_stop_key;
+
static
pthread_key_t vcl_worker_stop_key;
static const char *
vppcom_app_state_str (app_state_t state)
static const char *
vppcom_app_state_str (app_state_t state)
@@
-224,6
+224,7
@@
static void
vcl_worker_cleanup (void *arg)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
vcl_worker_cleanup (void *arg)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
+
VDBG (0, "cleaning up worker %u", wrk->wrk_index);
vcl_send_app_worker_add_del (0 /* is_add */ );
close (wrk->mqs_epfd);
VDBG (0, "cleaning up worker %u", wrk->wrk_index);
vcl_send_app_worker_add_del (0 /* is_add */ );
close (wrk->mqs_epfd);
@@
-290,6
+291,9
@@
vcl_worker_alloc_and_init ()
if (pthread_key_create (&vcl_worker_stop_key, vcl_worker_cleanup))
clib_warning ("failed to add pthread cleanup function");
if (pthread_key_create (&vcl_worker_stop_key, vcl_worker_cleanup))
clib_warning ("failed to add pthread cleanup function");
+ if (pthread_setspecific (vcl_worker_stop_key, &wrk->thread_id))
+ clib_warning ("failed to setup key value");
+ wrk->thread_id = pthread_self ();
clib_spinlock_unlock (&vcm->workers_lock);
clib_spinlock_unlock (&vcm->workers_lock);