fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-05 06:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: avoid multiple strlen() calls in _nm_utils_strv_dup_packed()

Browse source 
Instead of calling strlen() for all strings twice, remember the length
in a temporary buffer.

Yes, this is measurably faster.
This commit is contained in:
Thomas Haller 2020-08-25 11:51:46 +02:00
parent 2e0cd52474
commit 9b54d175bf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -3427,6 +3427,8 @@ _nm_utils_strv_dup_packed (const char *const*strv,
gssize len)
{
gs_free gsize *str_len_free = NULL;
gsize *str_len;
const char **result;
gsize mem_len;
gsize pre_len;
@ -3436,7 +3438,6 @@ _nm_utils_strv_dup_packed (const char *const*strv,
nm_assert (len >= -1);
mem_len = 0;
if (G_LIKELY (len < 0)) {
if ( !strv
|| !strv[0]) {
@ -3444,19 +3445,30 @@ _nm_utils_strv_dup_packed (const char *const*strv,
* yourself. */
return NULL;
}
for (i = 0; strv[i]; i++)
mem_len += strlen (strv[i]);
len2 = i;
len2 = NM_PTRARRAY_LEN (strv);
} else {
if (len == 0)
return NULL;
len2 = len;
for (i = 0; i < len; i++) {
if (G_LIKELY (strv[i]))
mem_len += strlen (strv[i]);
}
}
mem_len += len2;
if (len2 > 300u / sizeof (gsize)) {
str_len_free = g_new (gsize, len2);
str_len = str_len_free;
} else
str_len = g_newa (gsize, len2);
mem_len = 0;
for (i = 0; i < len2; i++) {
gsize l;
if (G_LIKELY (strv[i]))
l = strlen (strv[i]) + 1u;
else
l = 0;
str_len[i] = l;
mem_len += l;
}
pre_len = sizeof (const char *) * (len2 + 1u);
@ -3479,7 +3491,7 @@ _nm_utils_strv_dup_packed (const char *const*strv,
result[i] = sbuf;
l = strlen (strv[i]) + 1u;
l = str_len[i];
memcpy (sbuf, strv[i], l);
sbuf += l;
}