proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-02 20:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: refactor thread_execute

Browse Source 
Don't allocate threads in the stack, but use the standardized
`thread_get` and `thread_add_unused` to avoid creating corner cases in
the thread API.

This fixes a thread mutex memory leak in FreeBSD.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2018-10-01 13:38:34 -03:00
parent 6655966d2c
commit c4345fbf71
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/thread.c
View File

@ -1648,25 +1648,27 @@ void funcname_thread_execute(struct thread_master *m,
int (*func)(struct thread *), void *arg, int val,
debugargdef)
{
struct cpu_thread_history tmp;
struct thread dummy;
struct thread *thread;
memset(&dummy, 0, sizeof(struct thread));
/* Get or allocate new thread to execute. */
pthread_mutex_lock(&m->mtx);
{
thread = thread_get(m, THREAD_EVENT, func, arg, debugargpass);
pthread_mutex_init(&dummy.mtx, NULL);
dummy.type = THREAD_EVENT;
dummy.add_type = THREAD_EXECUTE;
dummy.master = NULL;
dummy.arg = arg;
dummy.u.val = val;
/* Set its event value. */
pthread_mutex_lock(&thread->mtx);
{
thread->add_type = THREAD_EXECUTE;
thread->u.val = val;
thread->ref = &thread;
}
pthread_mutex_unlock(&thread->mtx);
}
pthread_mutex_unlock(&m->mtx);
tmp.func = dummy.func = func;
tmp.funcname = dummy.funcname = funcname;
dummy.hist = hash_get(m->cpu_record, &tmp,
(void *(*)(void *))cpu_record_hash_alloc);
/* Execute thread doing all accounting. */
thread_call(thread);
dummy.schedfrom = schedfrom;
dummy.schedfrom_line = fromln;
thread_call(&dummy);
/* Give back or free thread. */
thread_add_unuse(m, thread);
}