colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nmcli/devices: return GPtrArray instead of GSList from get_device_list()

Browse Source 
A pointer array is slightly more efficient here, since we don't really
need the ability to insert elements in the middle. In fact, we'd prefer
if we could just add to the end, so that we'd spare some callers from a
need to do a g_slist_reverse().

Even though that alone being a good reason to use a GPtrArray instead of
GSList, I'm doing this for so that I could actually use the returned value
as-is in a call to nm_client_checkpoint_create() in a future patch.
This commit is contained in:
Lubomir Rintel
2022-05-04 10:21:02 +02:00
parent 767afeffd8
commit 2074b28976
1 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/nmcli/devices.c
View File

@@ -1109,7 +1109,7 @@ nmc_complete_device(NMClient *client, const char *prefix, gboolean wifi_only)
complete_device(devices, prefix, wifi_only); complete_device(devices, prefix, wifi_only);
} }
static GSList * static GPtrArray *
get_device_list(NmCli *nmc, int *argc, const char *const **argv) get_device_list(NmCli *nmc, int *argc, const char *const **argv)
{ {
int arg_num; int arg_num;
@@ -1117,7 +1117,7 @@ get_device_list(NmCli *nmc, int *argc, const char *const **argv)
gs_strfreev char **arg_arr = NULL; gs_strfreev char **arg_arr = NULL;
NMDevice **devices; NMDevice **devices;
GSList *queue = NULL; GPtrArray *queue = NULL;
NMDevice *device; NMDevice *device;
int i; int i;
@@ -1158,8 +1158,10 @@ get_device_list(NmCli *nmc, int *argc, const char *const **argv)
} }
if (device) { if (device) {
if (!g_slist_find(queue, device)) if (!queue)
queue = g_slist_prepend(queue, device); queue = g_ptr_array_new();
if (!g_ptr_array_find(queue, device, NULL))
g_ptr_array_add(queue, device);
else else
g_printerr(_("Warning: argument '%s' is duplicated.\n"), **argv); g_printerr(_("Warning: argument '%s' is duplicated.\n"), **argv);
} else { } else {
@@ -2625,7 +2627,8 @@ do_devices_disconnect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
{ {
NMDevice *device; NMDevice *device;
DeviceCbInfo *info = NULL; DeviceCbInfo *info = NULL;
GSList *queue, *iter; gs_unref_ptrarray GPtrArray *queue = NULL;
guint i;
/* Set default timeout for disconnect operation. */ /* Set default timeout for disconnect operation. */
if (nmc->timeout == -1) if (nmc->timeout == -1)
@@ -2641,8 +2644,7 @@ do_devices_disconnect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
if (!queue) if (!queue)
return; return;
if (nmc->complete) if (nmc->complete)
goto out; return;
queue = g_slist_reverse(queue);
info = g_slice_new0(DeviceCbInfo); info = g_slice_new0(DeviceCbInfo);
info->nmc = nmc; info->nmc = nmc;
@@ -2656,8 +2658,8 @@ do_devices_disconnect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
nmc->nowait_flag = (nmc->timeout == 0); nmc->nowait_flag = (nmc->timeout == 0);
nmc->should_wait++; nmc->should_wait++;
for (iter = queue; iter; iter = g_slist_next(iter)) { for (i = 0; i < queue->len; i++) {
device = iter->data; device = queue->pdata[i];
info->queue = g_slist_prepend(info->queue, g_object_ref(device)); info->queue = g_slist_prepend(info->queue, g_object_ref(device));
g_signal_connect(device, "notify::" NM_DEVICE_STATE, G_CALLBACK(disconnect_state_cb), info); g_signal_connect(device, "notify::" NM_DEVICE_STATE, G_CALLBACK(disconnect_state_cb), info);
@@ -2665,9 +2667,6 @@ do_devices_disconnect(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
/* Now disconnect the device */ /* Now disconnect the device */
nm_device_disconnect_async(device, info->cancellable, disconnect_device_cb, info); nm_device_disconnect_async(device, info->cancellable, disconnect_device_cb, info);
} }
out:
g_slist_free(queue);
} }
static void static void
@@ -2698,7 +2697,8 @@ do_devices_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
{ {
NMDevice *device; NMDevice *device;
DeviceCbInfo *info = NULL; DeviceCbInfo *info = NULL;
GSList *queue, *iter; gs_unref_ptrarray GPtrArray *queue = NULL;
guint i;
/* Set default timeout for delete operation. */ /* Set default timeout for delete operation. */
if (nmc->timeout == -1) if (nmc->timeout == -1)
@@ -2714,8 +2714,7 @@ do_devices_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
if (!queue) if (!queue)
return; return;
if (nmc->complete) if (nmc->complete)
goto out; return;
queue = g_slist_reverse(queue);
info = g_slice_new0(DeviceCbInfo); info = g_slice_new0(DeviceCbInfo);
info->nmc = nmc; info->nmc = nmc;
@@ -2725,17 +2724,14 @@ do_devices_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
nmc->nowait_flag = (nmc->timeout == 0); nmc->nowait_flag = (nmc->timeout == 0);
nmc->should_wait++; nmc->should_wait++;
for (iter = queue; iter; iter = g_slist_next(iter)) { for (i = 0; i < queue->len; i++) {
device = iter->data; device = queue->pdata[i];
info->queue = g_slist_prepend(info->queue, g_object_ref(device)); info->queue = g_slist_prepend(info->queue, g_object_ref(device));
/* Now delete the device */ /* Now delete the device */
nm_device_delete_async(device, NULL, delete_device_cb, info); nm_device_delete_async(device, NULL, delete_device_cb, info);
} }
out:
g_slist_free(queue);
} }
static void static void
@@ -2904,37 +2900,33 @@ device_removed(NMClient *client, NMDevice *device, NmCli *nmc)
static void static void
do_devices_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv) do_devices_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
{ {
const GPtrArray *devices;
gs_unref_ptrarray GPtrArray *devices_free = NULL;
guint i;
if (nmc->complete) if (nmc->complete)
return; return;
next_arg(nmc, &argc, &argv, NULL); next_arg(nmc, &argc, &argv, NULL);
if (argc == 0) { if (argc > 0) {
/* No devices specified. Monitor all. */ devices = devices_free = get_device_list(nmc, &argc, &argv);
const GPtrArray *devices = nm_client_get_devices(nmc->client);
int i;
for (i = 0; i < devices->len; i++)
device_watch(nmc, g_ptr_array_index(devices, i));
/* We'll watch the device additions too, never exit. */
nmc->should_wait++;
g_signal_connect(nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK(device_added), nmc);
} else {
GSList *queue = get_device_list(nmc, &argc, &argv);
GSList *iter;
if (argc) { if (argc) {
g_string_printf(nmc->return_text, _("Error: invalid extra argument '%s'."), *argv); g_string_printf(nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
return; return;
} }
} else {
/* No devices specified. Monitor all. */
devices = nm_client_get_devices(nmc->client);
/* Monitor the specified devices. */ /* We'll watch the device additions too, never exit. */
for (iter = queue; iter; iter = g_slist_next(iter)) nmc->should_wait++;
device_watch(nmc, NM_DEVICE(iter->data)); g_signal_connect(nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK(device_added), nmc);
g_slist_free(queue);
} }
for (i = 0; i < devices->len; i++)
device_watch(nmc, g_ptr_array_index(devices, i));
g_signal_connect(nmc->client, NM_CLIENT_DEVICE_REMOVED, G_CALLBACK(device_removed), nmc); g_signal_connect(nmc->client, NM_CLIENT_DEVICE_REMOVED, G_CALLBACK(device_removed), nmc);
} }