summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInga Stotland <inga.stotland@intel.com>2020-05-21 17:34:57 -0700
committerAbhay Agarwal <ay.agarwal@samsung.com>2020-05-28 16:57:22 +0530
commit959a9ffafe8a8732ead4b5cbc58413a770dbc4a6 (patch)
tree31e7d619ecb84ffb134ae2e1800b2d1a841a0f8f
parent85bb1cb11c4028adc9ede12af2805a9c8862e1bd (diff)
downloadbluez-959a9ffafe8a8732ead4b5cbc58413a770dbc4a6.tar.gz
bluez-959a9ffafe8a8732ead4b5cbc58413a770dbc4a6.tar.bz2
bluez-959a9ffafe8a8732ead4b5cbc58413a770dbc4a6.zip
mesh: Create a queue of pending requests in mesh_init()
This removes unnnecessary checking for queue existence every time either Attach(), Create() or Import() methods are called. Change-Id: Icb85c67267594b9fa9f6a11c6f00a35eee8f9fc9 Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
-rw-r--r--mesh/mesh.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 32540cc2..b603d8b9 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -296,6 +296,8 @@ bool mesh_init(const char *config_dir, const char *mesh_conf_fname,
mesh_io_get_caps(mesh.io, &caps);
mesh.max_filters = caps.max_num_filters;
+ pending_queue = l_queue_new();
+
return true;
}
@@ -651,9 +653,6 @@ static struct l_dbus_message *attach_call(struct l_dbus *dbus,
sender = l_dbus_message_get_sender(msg);
pending_msg = l_dbus_message_ref(msg);
- if (!pending_queue)
- pending_queue = l_queue_new();
-
l_queue_push_tail(pending_queue, pending_msg);
status = node_attach(app_path, sender, token, attach_ready_cb,
@@ -759,10 +758,8 @@ static struct l_dbus_message *create_network_call(struct l_dbus *dbus,
"Bad device UUID");
sender = l_dbus_message_get_sender(msg);
- pending_msg = l_dbus_message_ref(msg);
- if (!pending_queue)
- pending_queue = l_queue_new();
+ pending_msg = l_dbus_message_ref(msg);
l_queue_push_tail(pending_queue, pending_msg);
node_create(app_path, sender, uuid, create_node_ready_cb,
@@ -850,11 +847,8 @@ static struct l_dbus_message *import_call(struct l_dbus *dbus,
"Bad address");
sender = l_dbus_message_get_sender(msg);
- pending_msg = l_dbus_message_ref(msg);
-
- if (!pending_queue)
- pending_queue = l_queue_new();
+ pending_msg = l_dbus_message_ref(msg);
l_queue_push_tail(pending_queue, pending_msg);
if (!node_import(app_path, sender, uuid, dev_key, net_key, net_idx,