aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-29 18:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/msg_queue: make it a tal object.

Browse Source 
This way there's no need for a context pointer, and freeing a msg_queue
frees its contents, as expected.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-10-25 10:16:08 +10:30
parent 3c97f3954e
commit 3e2dea221b
6 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/msg_queue.c
View File

@@ -1,18 +1,22 @@
#include <assert.h>
#include <ccan/take/take.h>
#include <common/msg_queue.h>
#include <common/utils.h>
#include <wire/wire.h>
void msg_queue_init(struct msg_queue *q, const tal_t *ctx)
struct msg_queue {
const u8 **q;
};
struct msg_queue *msg_queue_new(const tal_t *ctx)
{
q->q = tal_arr(ctx, const u8 *, 0);
q->ctx = ctx;
struct msg_queue *q = tal(ctx, struct msg_queue);
q->q = tal_arr(q, const u8 *, 0);
return q;
}
static void do_enqueue(struct msg_queue *q, const u8 *add)
static void do_enqueue(struct msg_queue *q, const u8 *add TAKES)
{
*tal_arr_expand(&q->q) = tal_dup_arr(q->ctx, u8, add, tal_count(add), 0);
*tal_arr_expand(&q->q) = tal_dup_arr(q, u8, add, tal_count(add), 0);
/* In case someone is waiting */
io_wake(q);
@@ -26,7 +30,7 @@ void msg_enqueue(struct msg_queue *q, const u8 *add)
void msg_enqueue_fd(struct msg_queue *q, int fd)
{
u8 *fdmsg = tal_arr(q->ctx, u8, 0);
u8 *fdmsg = tal_arr(q, u8, 0);
towire_u16(&fdmsg, MSG_PASS_FD);
towire_u32(&fdmsg, fd);
do_enqueue(q, take(fdmsg));