diff mbox series

[RFC,BlueZ,v4,2/3] emulator/btdev: clean up the queue before closing the test

Message ID 20210626063010.152987-2-hj.tedd.an@gmail.com (mailing list archive)
State Superseded
Headers show
Series [RFC,BlueZ,v4,1/3] emulator/btdev: Update the white list and resolving list size | expand

Commit Message

Tedd Ho-Jeong An June 26, 2021, 6:30 a.m. UTC 
From: Tedd Ho-Jeong An <tedd.an@intel.com>

This patch clean up the queue for connection before closing the test to
prevent the potential memory leak.

==50== 32 bytes in 1 blocks are definitely lost in loss record 18 of 32
==50==    at 0x483A809: malloc (vg_replace_malloc.c:307)
==50==    by 0x14A37E: btd_malloc (util.c:33)
==50==    by 0x149D9D: queue_new (queue.c:47)
==50==    by 0x13B3C0: btdev_create (btdev.c:6042)
==50==    by 0x13178E: create_vhci (hciemu.c:229)
==50==    by 0x13178E: hciemu_new_num (hciemu.c:403)
==50==    by 0x130E2C: read_index_list_callback (mgmt-tester.c:357)
==50==    by 0x14AD91: request_complete (mgmt.c:264)
==50==    by 0x14BD34: can_read_data (mgmt.c:356)
==50==    by 0x14E794: watch_callback (io-glib.c:157)
==50==    by 0x48B578E: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.6400.6)
==50==    by 0x48B5B17: ??? (in /usr/lib64/libglib-2.0.so.0.6400.6)
==50==    by 0x48B5E32: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.6400.6)
==50==
==50== 32 bytes in 1 blocks are definitely lost in loss record 19 of 32
==50==    at 0x483A809: malloc (vg_replace_malloc.c:307)
==50==    by 0x14A37E: btd_malloc (util.c:33)
==50==    by 0x149D9D: queue_new (queue.c:47)
==50==    by 0x13B3C0: btdev_create (btdev.c:6042)
==50==    by 0x1318F7: hciemu_client_new (hciemu.c:332)
==50==    by 0x1318F7: hciemu_new_num (hciemu.c:412)
==50==    by 0x130E2C: read_index_list_callback (mgmt-tester.c:357)
==50==    by 0x14AD91: request_complete (mgmt.c:264)
==50==    by 0x14BD34: can_read_data (mgmt.c:356)
==50==    by 0x14E794: watch_callback (io-glib.c:157)
==50==    by 0x48B578E: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.6400.6)
==50==    by 0x48B5B17: ??? (in /usr/lib64/libglib-2.0.so.0.6400.6)
==50==    by 0x48B5E32: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.6400.6)
---
 emulator/btdev.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Luiz Augusto von Dentz July 1, 2021, 9:28 p.m. UTC | #1 
Hi Tedd,

On Fri, Jun 25, 2021 at 11:31 PM Tedd Ho-Jeong An <hj.tedd.an@gmail.com> wrote:
>
> From: Tedd Ho-Jeong An <tedd.an@intel.com>
>
> This patch clean up the queue for connection before closing the test to
> prevent the potential memory leak.
>
> ==50== 32 bytes in 1 blocks are definitely lost in loss record 18 of 32
> ==50==    at 0x483A809: malloc (vg_replace_malloc.c:307)
> ==50==    by 0x14A37E: btd_malloc (util.c:33)
> ==50==    by 0x149D9D: queue_new (queue.c:47)
> ==50==    by 0x13B3C0: btdev_create (btdev.c:6042)
> ==50==    by 0x13178E: create_vhci (hciemu.c:229)
> ==50==    by 0x13178E: hciemu_new_num (hciemu.c:403)
> ==50==    by 0x130E2C: read_index_list_callback (mgmt-tester.c:357)
> ==50==    by 0x14AD91: request_complete (mgmt.c:264)
> ==50==    by 0x14BD34: can_read_data (mgmt.c:356)
> ==50==    by 0x14E794: watch_callback (io-glib.c:157)
> ==50==    by 0x48B578E: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ==50==    by 0x48B5B17: ??? (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ==50==    by 0x48B5E32: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ==50==
> ==50== 32 bytes in 1 blocks are definitely lost in loss record 19 of 32
> ==50==    at 0x483A809: malloc (vg_replace_malloc.c:307)
> ==50==    by 0x14A37E: btd_malloc (util.c:33)
> ==50==    by 0x149D9D: queue_new (queue.c:47)
> ==50==    by 0x13B3C0: btdev_create (btdev.c:6042)
> ==50==    by 0x1318F7: hciemu_client_new (hciemu.c:332)
> ==50==    by 0x1318F7: hciemu_new_num (hciemu.c:412)
> ==50==    by 0x130E2C: read_index_list_callback (mgmt-tester.c:357)
> ==50==    by 0x14AD91: request_complete (mgmt.c:264)
> ==50==    by 0x14BD34: can_read_data (mgmt.c:356)
> ==50==    by 0x14E794: watch_callback (io-glib.c:157)
> ==50==    by 0x48B578E: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ==50==    by 0x48B5B17: ??? (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ==50==    by 0x48B5E32: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.6400.6)
> ---
>  emulator/btdev.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/emulator/btdev.c b/emulator/btdev.c
> index 202fc7996..75cca7549 100644
> --- a/emulator/btdev.c
> +++ b/emulator/btdev.c
> @@ -624,8 +624,10 @@ static void conn_unlink(struct btdev_conn *conn1, struct btdev_conn *conn2)
>         conn2->link = NULL;
>  }
>
> -static void conn_remove(struct btdev_conn *conn)
> +static void conn_remove(void *data)
>  {
> +       struct btdev_conn *conn = data;
> +
>         if (conn->link) {
>                 struct btdev_conn *link = conn->link;
>
> @@ -6056,6 +6058,7 @@ void btdev_destroy(struct btdev *btdev)
>         bt_crypto_unref(btdev->crypto);
>         del_btdev(btdev);
>
> +       queue_destroy(btdev->conns, conn_remove);
>         queue_destroy(btdev->le_ext_adv, le_ext_adv_free);
>
>         free(btdev);
> --
> 2.26.3

Ive pushed this one.
diff mbox series

Patch

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 202fc7996..75cca7549 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -624,8 +624,10 @@  static void conn_unlink(struct btdev_conn *conn1, struct btdev_conn *conn2)
 	conn2->link = NULL;
 }
 
-static void conn_remove(struct btdev_conn *conn)
+static void conn_remove(void *data)
 {
+	struct btdev_conn *conn = data;
+
 	if (conn->link) {
 		struct btdev_conn *link = conn->link;
 
@@ -6056,6 +6058,7 @@  void btdev_destroy(struct btdev *btdev)
 	bt_crypto_unref(btdev->crypto);
 	del_btdev(btdev);
 
+	queue_destroy(btdev->conns, conn_remove);
 	queue_destroy(btdev->le_ext_adv, le_ext_adv_free);
 
 	free(btdev);