tests/test-util-filemonitor: Avoid pointless allocations
PATCH 1/1 tests/test-util-filemonitor: Avoid pointless allocations
Coverity reports few resource leaks. While they are harmless, fix them to avoid them showing on the reports.
--- tests/unit/test-util-filemonitor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
tests/unit/test-util-filemonitor.c +8 -5
@@ -398,7 +398,7 @@ test_file_monitor_events(void) };Error *local_err =NULL ;GError *gerr =NULL ; -QFileMonitor *mon =qemu_file_monitor_new (&local_err); +QFileMonitor *mon;QemuThread th;GTimer *timer;gchar *dir =NULL ;
@@ -407,12 +407,9 @@ test_file_monitor_events(void)char *pathsrc =NULL ;char *pathdst =NULL ;QFileMonitorTestData data; -GHashTable *ids =g_hash_table_new (g_int64_hash, g_int64_equal); +GHashTable *ids;char *travis_arch; -qemu_mutex_init (&data.lock); - data.records =NULL ; -/* * This test does not work on Travis LXD containers since some * syscalls are blocked in that environment.
@@ -423,6 +420,12 @@ test_file_monitor_events(void)return ; } + mon =qemu_file_monitor_new (&local_err); + ids =g_hash_table_new (g_int64_hash, g_int64_equal); + +qemu_mutex_init (&data.lock); + data.records =NULL ; +/* * The file monitor needs the main loop running in * order to receive events from inotify. We must
Signature · 1 line
2.38.1
Quoted 27 lines · Philippe Mathieu-Daudé
Coverity reports few resource leaks. While they are harmless, fix them to avoid them showing on the reports.
Reported-by Coverity (CID 1432615: RESOURCE_LEAK)Fixes 4f370b1098 ("test-util-filemonitor: Skip test on non-x86 Travis containers")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/unit/test-util-filemonitor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)tests/unit/test-util-filemonitor.c +1
-1@@ -398,7 +398,7 @@ test_file_monitor_events(void) };Error *local_err =NULL ;GError *gerr =NULL ; -QFileMonitor *mon =qemu_file_monitor_new (&local_err); +QFileMonitor *mon;QemuThread th;GTimer *timer;gchar *dir =NULL ;@@ -407,12 +407,9 @@ test_file_monitor_events(void)char *pathsrc =NULL ;char *pathdst =NULL ;QFileMonitorTestData data;
tests/unit/test-util-filemonitor.c test_file_monitor_events(void) · line 415
Quoted 10 lines
tests/unit/test-util-filemonitor.c +1
-4-GHashTable *ids =g_hash_table_new (g_int64_hash, g_int64_equal); +GHashTable *ids;char *travis_arch; -qemu_mutex_init (&data.lock); - data.records =NULL ; -/* * This test does not work on Travis LXD containers since some * syscalls are blocked in that environment.
Right here is logic that checks the TRAVIS_ARCH env variable.
IMHO this should just be moved out into the main() method, so we don't even start test when under Travis. Just make the whole program exits with a skip status on travis.
Quoted 16 lines
tests/unit/test-util-filemonitor.c +6
-0@@ -423,6 +420,12 @@ test_file_monitor_events(void)return ; } + mon =qemu_file_monitor_new (&local_err); + ids =g_hash_table_new (g_int64_hash, g_int64_equal); + +qemu_mutex_init (&data.lock); + data.records =NULL ; +/* * The file monitor needs the main loop running in * order to receive events from inotify. We must Signature · 1 line
2.38.1
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 22 lines · Daniel P. Berrangé
Quoted 15 lines · Philippe Mathieu-Daudé
Coverity reports few resource leaks. While they are harmless, fix them to avoid them showing on the reports.
Reported-by Coverity (CID 1432615: RESOURCE_LEAK)Fixes 4f370b1098 ("test-util-filemonitor: Skip test on non-x86 Travis containers")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/unit/test-util-filemonitor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)tests/unit/test-util-filemonitor.c +0
-0tests/unit/test-util-filemonitor.c test_file_monitor_events(void) · line 402
Quoted 5 lines
tests/unit/test-util-filemonitor.c +0
-0@@ -398,7 +398,7 @@ test_file_monitor_events(void)/* * This test does not work on Travis LXD containers since some * syscalls are blocked in that environment.
Quoted 5 lines
Right here is logic that checks the
TRAVIS_ARCHenv variable.IMHO this should just be moved out into the
main()method, so we don't even start test when under Travis. Just make the whole program exits with a skip status on travis.
Clever eh :)