Commit: bc2e394b5c86e0259fc9018520dfc152abed97a1
Parent: 72c491eb405a47d7380a8cb12a78db92927ff9d2
Author: Szymon Janc <szymon.janc@tieto.com>
Committer: Johan Hedberg <johan.hedberg@intel.com>
Date: 2012-12-03 13:04:22
Tree: 1378f22de464336e85a7ac03631ca55feb37b936

adaptername: Refactor adaptername_init/exit to fix exit path This makes adaptername plugin properly cleanup its fds on exit. Fixes following warnings from valgrind: 16 bytes in 1 blocks are still reachable in loss record 42 of 221 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FA78: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E92CA2: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E93ABD: g_slist_prepend (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E78350: g_source_add_poll (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4EB5E32: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E6D0C3: g_io_add_watch_full (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565FA: adaptername_init (adaptername.c:302) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544) 18 bytes in 1 blocks are still reachable in loss record 58 of 221 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FA78: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E942DD: g_strdup (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E78A69: g_source_set_name (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4EB5E0B: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E6D0C3: g_io_add_watch_full (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565FA: adaptername_init (adaptername.c:302) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544) 32 bytes in 1 blocks are still reachable in loss record 86 of 221 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FA78: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E78722: g_source_set_callback (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E6D0DB: g_io_add_watch_full (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565FA: adaptername_init (adaptername.c:302) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544) 32 bytes in 1 blocks are still reachable in loss record 87 of 221 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FA78: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E92CA2: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E77285: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E775AF: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E78115: g_source_attach (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E6D0E5: g_io_add_watch_full (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565FA: adaptername_init (adaptername.c:302) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544) 120 bytes in 1 blocks are still reachable in loss record 167 of 221 at 0x4C2B6CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FA78: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4EB66F4: g_io_channel_unix_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565A9: adaptername_init (adaptername.c:298) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544) 120 bytes in 1 blocks are still reachable in loss record 168 of 221 at 0x4C29DB4: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E7FAE0: g_malloc0 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E78044: g_source_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4EB5DF9: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x4E6D0C3: g_io_add_watch_full (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.3) by 0x1565FA: adaptername_init (adaptername.c:302) by 0x1712AB: plugin_init (plugin.c:217) by 0x1215D2: main (main.c:544)

Diffstat

M plugins/adaptername.c | 59 +++++++++++++++++++++++++++++++++++++++- - - - - - - - - - - - - - - - - - - -

1 files changed, 39 insertions(+), 20 deletions(-)

View Full Diff | Patch