External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorTestFree: Join worker thread

Browse Source 
Join the worker thread no matter if it is running or zombie already.
With current implementation the thread is joined iff @running is true.
However, when worker executes the last line, @running is set to false.
Hence qemuMonitorTestFree() won't join it (and free resources) even
though we can clearly see worker has run (nobody else sets @running =
false).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2013-10-02 18:20:18 +02:00
parent 555b042016
commit 2d670cd42b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemumonitortestutils.c
View File

@ -51,6 +51,7 @@ struct _qemuMonitorTest {
bool json; bool json;
bool quit; bool quit;
bool running; bool running;
bool started;
char *incoming; char *incoming;
size_t incomingLength; size_t incomingLength;
@ -354,7 +355,7 @@ qemuMonitorTestFree(qemuMonitorTestPtr test)
virObjectUnref(test->vm); virObjectUnref(test->vm);
if (test->running) if (test->started)
virThreadJoin(&test->thread); virThreadJoin(&test->thread);
if (timer != -1) if (timer != -1)
@ -846,7 +847,7 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test)
virMutexUnlock(&test->lock); virMutexUnlock(&test->lock);
goto error; goto error;
} }
test->running = true; test->started = test->running = true;
virMutexUnlock(&test->lock); virMutexUnlock(&test->lock);
return 0; return 0;