SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-rtnl: use GREEDY_REALLOC for message queues

Browse Source
This commit is contained in:
Tom Gundersen
2014-04-10 19:00:36 +02:00
parent d47e1de40e
commit 77768cbabc
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-rtnl/rtnl-internal.h
+2
View File
@@ -66,9 +66,11 @@ struct sd_rtnl {
sd_rtnl_message **rqueue;
unsigned rqueue_size;
size_t rqueue_allocated;
sd_rtnl_message **wqueue;
unsigned wqueue_size;
size_t wqueue_allocated;
bool processing:1;
src/libsystemd/sd-rtnl/sd-rtnl.c
+3 -8
View File
@@ -51,8 +51,7 @@ static int sd_rtnl_new(sd_rtnl **ret) {
/* We guarantee that wqueue always has space for at least
* one entry */
rtnl->wqueue = new(sd_rtnl_message*, 1);
if (!rtnl->wqueue)
if (!GREEDY_REALLOC(rtnl->wqueue, rtnl->wqueue_allocated, 1))
return -ENOMEM;
*ret = rtnl;
@@ -188,18 +187,14 @@ int sd_rtnl_send(sd_rtnl *nl,
nl->wqueue_size = 1;
}
} else {
sd_rtnl_message **q;
/* append to queue */
if (nl->wqueue_size >= RTNL_WQUEUE_MAX)
return -ENOBUFS;
q = realloc(nl->wqueue, sizeof(sd_rtnl_message*) * (nl->wqueue_size + 1));
if (!q)
if (!GREEDY_REALLOC(nl->wqueue, nl->wqueue_allocated, nl->wqueue_size + 1))
return -ENOMEM;
nl->wqueue = q;
q[nl->wqueue_size ++] = sd_rtnl_message_ref(message);
nl->wqueue[nl->wqueue_size ++] = sd_rtnl_message_ref(message);
}
if (serial)