ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svm: cleanup mq private data on fifo segment cleanup

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I65373f2cd5a33381da1e51ed7ab7a8b1358cef29
This commit is contained in:
Florin Coras
2021-03-30 00:23:54 -07:00
committed by Damjan Marion
parent f632ab5e3b
commit 8c517c8fb4
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/svm/fifo_segment.c
View File

@ -814,7 +814,7 @@ fifo_segment_cleanup (fifo_segment_t *fs)
vec_free (fs->slices);
vec_foreach (fs->mqs, mq)
vec_free (mq->rings);
svm_msg_q_cleanup (mq);
vec_free (fs->mqs);
}

11
src/svm/message_queue.c
View File

@ -166,11 +166,20 @@ svm_msg_q_attach (svm_msg_q_t *mq, void *smq_base)
clib_spinlock_init (&mq->q.lock);
}
void
svm_msg_q_cleanup (svm_msg_q_t *mq)
{
vec_free (mq->rings);
clib_spinlock_free (&mq->q.lock);
if (mq->q.evtfd != -1)
close (mq->q.evtfd);
}
void
svm_msg_q_free (svm_msg_q_t * mq)
{
svm_msg_q_cleanup (mq);
clib_mem_free (mq->q.shr);
clib_spinlock_free (&mq->q.lock);
clib_mem_free (mq);
}

5
src/svm/message_queue.h
View File

@ -125,6 +125,11 @@ uword svm_msg_q_size_to_alloc (svm_msg_q_cfg_t *cfg);
void svm_msg_q_attach (svm_msg_q_t *mq, void *smq_base);
/**
* Cleanup mq's private data
*/
void svm_msg_q_cleanup (svm_msg_q_t *mq);
/**
* Free message queue
*