From: Steve Schrock <steve.schrock@getcruise.com>
To: ofono@lists.linux.dev
Cc: Steve Schrock <steve.schrock@getcruise.com>
Subject: [PATCH 2/2] qmimodem: Use l_queue instead of GList for pending service creation
Date: Thu, 22 Feb 2024 23:53:56 +0000 [thread overview]
Message-ID: <20240222235356.32485-2-steve.schrock@getcruise.com> (raw)
In-Reply-To: <20240222235356.32485-1-steve.schrock@getcruise.com>
---
drivers/qmimodem/qmi.c | 43 ++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 168dee1a..99b3d84d 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -1382,24 +1382,27 @@ static void service_create_shared_reply(struct l_idle *idle, void *user_data)
__qmi_device_discovery_complete(data->device, &data->super);
}
+static void service_create_shared_schedule_callback(void *data, void *user_data)
+{
+ struct service_create_shared_data *shared_data = data;
+ struct qmi_service *service = user_data;
+
+ shared_data->service = qmi_service_ref(service);
+ shared_data->idle = l_idle_create(service_create_shared_reply,
+ shared_data, NULL);
+
+}
+
static void service_create_shared_pending_reply(struct qmi_device *device,
unsigned int type,
struct qmi_service *service)
{
- gpointer key = L_UINT_TO_PTR(type | 0x80000000);
- GList **shared = l_hashmap_remove(device->service_list, key);
- GList *l;
-
- for (l = *shared; l; l = l->next) {
- struct service_create_shared_data *shared_data = l->data;
-
- shared_data->service = qmi_service_ref(service);
- shared_data->idle = l_idle_create(service_create_shared_reply,
- shared_data, NULL);
- }
+ void *key = L_UINT_TO_PTR(type | 0x80000000);
+ struct l_queue *shared = l_hashmap_remove(device->service_list, key);
- g_list_free(*shared);
- l_free(shared);
+ l_queue_foreach(shared, service_create_shared_schedule_callback,
+ service);
+ l_queue_destroy(shared, NULL);
}
static void service_create_shared_data_free(gpointer user_data)
@@ -1699,14 +1702,14 @@ static int qmi_device_qmux_client_create(struct qmi_device *device,
unsigned char client_req[] = { 0x01, 0x01, 0x00, service_type };
struct qmi_request *req;
struct qmux_client_create_data *data;
- GList **shared;
+ struct l_queue *shared;
unsigned int type_val = service_type;
int i;
if (!device->version_list)
return -ENOENT;
- shared = l_new(GList *, 1);
+ shared = l_queue_new();
data = l_new(struct qmux_client_create_data, 1);
data->super.destroy = qmux_client_create_data_free;
@@ -2148,7 +2151,7 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
qmi_create_func_t func, void *user_data,
qmi_destroy_func_t destroy)
{
- GList **l = NULL;
+ struct l_queue *shared = NULL;
struct qmi_service *service = NULL;
unsigned int type_val = type;
int r;
@@ -2159,10 +2162,10 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
if (type == QMI_SERVICE_CONTROL)
return false;
- l = l_hashmap_lookup(device->service_list,
+ shared = l_hashmap_lookup(device->service_list,
L_UINT_TO_PTR(type_val | 0x80000000));
- if (!l) {
+ if (!shared) {
/*
* There is no way to find in an l_hashmap using a custom
* function. Instead we use a temporary struct to store the
@@ -2179,7 +2182,7 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
} else
type_val |= 0x80000000;
- if (l || service) {
+ if (shared || service) {
struct service_create_shared_data *data;
data = l_new(struct service_create_shared_data, 1);
@@ -2195,7 +2198,7 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
data->idle = l_idle_create(service_create_shared_reply,
data, NULL);
} else
- *l = g_list_prepend(*l, data);
+ l_queue_push_head(shared, data);
__qmi_device_discovery_started(device, &data->super);
--
2.40.1
--
*Confidentiality Note:* We care about protecting our proprietary
information, confidential material, and trade secrets. This message may
contain some or all of those things. Cruise will suffer material harm if
anyone other than the intended recipient disseminates or takes any action
based on this message. If you have received this message (including any
attachments) in error, please delete it immediately and notify the sender
promptly.
next prev parent reply other threads:[~2024-02-22 23:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 23:53 [PATCH 1/2] qmimodem: Use l_queue instead of GList for notifications Steve Schrock
2024-02-22 23:53 ` Steve Schrock [this message]
2024-02-23 16:20 ` [PATCH 2/2] qmimodem: Use l_queue instead of GList for pending service creation Denis Kenzior
2024-02-23 16:10 ` [PATCH 1/2] qmimodem: Use l_queue instead of GList for notifications patchwork-bot+ofono
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240222235356.32485-2-steve.schrock@getcruise.com \
--to=steve.schrock@getcruise.com \
--cc=ofono@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).