#include <ccan/take/take.h>
#include <assert.h>
#include <stdio.h>
-#include <stdarg.h>
#include <stddef.h>
#include <string.h>
#include <limits.h>
//#define TAL_DEBUG 1
+#define NOTIFY_IS_DESTRUCTOR 512
+
/* 32-bit type field, first byte 0 in either endianness. */
enum prop_type {
CHILDREN = 0x00c1d500,
- DESTRUCTOR = 0x00de5700,
NAME = 0x00111100,
+ NOTIFIER = 0x00071f00,
+ LENGTH = 0x00515300
};
struct tal_hdr {
struct list_head children; /* Head of siblings. */
};
-struct destructor {
- struct prop_hdr hdr; /* DESTRUCTOR */
- void (*destroy)(void *me);
-};
-
struct name {
struct prop_hdr hdr; /* NAME */
char name[];
};
+struct length {
+ struct prop_hdr hdr; /* LENGTH */
+ size_t count;
+};
+
+struct notifier {
+ struct prop_hdr hdr; /* NOTIFIER */
+ enum tal_notify_type types;
+ union {
+ void (*notifyfn)(tal_t *, enum tal_notify_type, void *);
+ void (*destroy)(tal_t *); /* If NOTIFY_IS_DESTRUCTOR set */
+ } u;
+};
+
static struct {
struct tal_hdr hdr;
struct children c;
static void *(*resizefn)(void *, size_t size) = realloc;
static void (*freefn)(void *) = free;
static void (*errorfn)(const char *msg) = (void *)abort;
+static bool initialized = false;
+/* Count on non-destrutor notifiers; often stays zero. */
+static size_t notifiers = 0;
static inline void COLD call_error(const char *msg)
{
return (void *)((size_t)parent_child & ~(size_t)1);
}
-static bool initialized = false;
-
/* This means valgrind can see leaks. */
static void tal_cleanup(void)
{
t = (struct tal_hdr *)((char *)ctx - sizeof(struct tal_hdr));
check_bounds(t);
- if (t->prop && !is_literal(t->prop))
- check_bounds(t->prop);
check_bounds(ignore_destroying_bit(t->parent_child));
check_bounds(t->list.next);
check_bounds(t->list.prev);
+ if (t->prop && !is_literal(t->prop))
+ check_bounds(t->prop);
return t;
}
return to_tal_hdr(ctx);
}
-static void *from_tal_hdr(struct tal_hdr *hdr)
+static void *from_tal_hdr(const struct tal_hdr *hdr)
{
- return hdr + 1;
+ return (void *)(hdr + 1);
}
#ifdef TAL_DEBUG
}
#endif
-static void *allocate(size_t size)
+static void notify(const struct tal_hdr *ctx,
+ enum tal_notify_type type, const void *info)
{
- void *ret;
+ const struct prop_hdr *p;
- /* Don't hand silly sizes to malloc. */
- if (size >> (CHAR_BIT*sizeof(size) - 1)) {
- call_error("allocation size overflow");
- return NULL;
+ for (p = ctx->prop; p; p = p->next) {
+ struct notifier *n;
+
+ if (is_literal(p))
+ break;
+ if (p->type != NOTIFIER)
+ continue;
+ n = (struct notifier *)p;
+ if (n->types & type) {
+ if (n->types & NOTIFY_IS_DESTRUCTOR)
+ n->u.destroy(from_tal_hdr(ctx));
+ else
+ n->u.notifyfn(from_tal_hdr(ctx), type,
+ (void *)info);
+ }
}
+}
- ret = allocfn(size);
+static void *allocate(size_t size)
+{
+ void *ret = allocfn(size);
if (!ret)
call_error("allocation failed");
else
parent->prop = hdr;
}
-static struct destructor *add_destructor_property(struct tal_hdr *t,
- void (*destroy)(void *))
+static struct notifier *add_notifier_property(struct tal_hdr *t,
+ enum tal_notify_type types,
+ void (*fn)(void *,
+ enum tal_notify_type,
+ void *))
{
- struct destructor *prop = allocate(sizeof(*prop));
+ struct notifier *prop = allocate(sizeof(*prop));
if (prop) {
- init_property(&prop->hdr, t, DESTRUCTOR);
- prop->destroy = destroy;
+ init_property(&prop->hdr, t, NOTIFIER);
+ prop->types = types;
+ prop->u.notifyfn = fn;
}
return prop;
}
+static enum tal_notify_type del_notifier_property(struct tal_hdr *t,
+ void (*fn)(tal_t *,
+ enum tal_notify_type,
+ void *))
+{
+ struct prop_hdr **p;
+
+ for (p = (struct prop_hdr **)&t->prop; *p; p = &(*p)->next) {
+ struct notifier *n;
+
+ if (is_literal(*p))
+ break;
+ if ((*p)->type != NOTIFIER)
+ continue;
+ n = (struct notifier *)*p;
+ if (n->u.notifyfn == fn) {
+ enum tal_notify_type types = n->types;
+ *p = (*p)->next;
+ freefn(n);
+ return types & ~NOTIFY_IS_DESTRUCTOR;
+ }
+ }
+ return 0;
+}
+
static struct name *add_name_property(struct tal_hdr *t, const char *name)
{
struct name *prop;
return prop;
}
+static struct length *add_length_property(struct tal_hdr *t, size_t count)
+{
+ struct length *prop;
+
+ prop = allocate(sizeof(*prop));
+ if (prop) {
+ init_property(&prop->hdr, t, LENGTH);
+ prop->count = count;
+ }
+ return prop;
+}
+
static struct children *add_child_property(struct tal_hdr *parent,
struct tal_hdr *child)
{
return true;
}
-static void del_tree(struct tal_hdr *t)
+static void del_tree(struct tal_hdr *t, const tal_t *orig)
{
struct prop_hdr **prop, *p, *next;
set_destroying_bit(&t->parent_child);
- /* Carefully call destructors, removing as we go. */
- while ((prop = find_property_ptr(t, DESTRUCTOR))) {
- struct destructor *d = (struct destructor *)*prop;
- d->destroy(from_tal_hdr(t));
- *prop = d->hdr.next;
- freefn(d);
- }
+ /* Call free notifiers. */
+ notify(t, TAL_NOTIFY_FREE, (tal_t *)orig);
/* Now free children and groups. */
prop = find_property_ptr(t, CHILDREN);
while ((i = list_top(&c->children, struct tal_hdr, list))) {
list_del(&i->list);
- del_tree(i);
+ del_tree(i, orig);
}
}
return NULL;
}
debug_tal(parent);
+ if (notifiers)
+ notify(parent, TAL_NOTIFY_ADD_CHILD, from_tal_hdr(child));
return from_tal_hdr(debug_tal(child));
}
+static bool adjust_size(size_t *size, size_t count)
+{
+ /* Multiplication wrap */
+ if (count && unlikely(*size * count / *size != count))
+ goto overflow;
+
+ *size *= count;
+
+ /* Make sure we don't wrap adding header. */
+ if (*size + sizeof(struct tal_hdr) < sizeof(struct tal_hdr))
+ goto overflow;
+ return true;
+overflow:
+ call_error("allocation size overflow");
+ return false;
+}
+
+void *tal_alloc_arr_(const tal_t *ctx, size_t size, size_t count, bool clear,
+ bool add_count, const char *label)
+{
+ void *ret;
+
+ if (!adjust_size(&size, count))
+ return NULL;
+
+ ret = tal_alloc_(ctx, size, clear, label);
+ if (likely(ret) && add_count) {
+ if (unlikely(!add_length_property(to_tal_hdr(ret), count)))
+ ret = tal_free(ret);
+ }
+ return ret;
+}
+
void *tal_free(const tal_t *ctx)
{
if (ctx) {
struct tal_hdr *t;
int saved_errno = errno;
t = debug_tal(to_tal_hdr(ctx));
+ if (notifiers)
+ notify(ignore_destroying_bit(t->parent_child)->parent,
+ TAL_NOTIFY_DEL_CHILD, ctx);
list_del(&t->list);
- del_tree(t);
+ del_tree(t, ctx);
errno = saved_errno;
}
return NULL;
return NULL;
}
debug_tal(newpar);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_STEAL, new_parent);
}
return (void *)ctx;
}
-bool tal_add_destructor_(tal_t *ctx, void (*destroy)(void *me))
+bool tal_add_destructor_(const tal_t *ctx, void (*destroy)(void *me))
+{
+ tal_t *t = debug_tal(to_tal_hdr(ctx));
+ return add_notifier_property(t, TAL_NOTIFY_FREE|NOTIFY_IS_DESTRUCTOR,
+ (void *)destroy);
+}
+
+bool tal_add_notifier_(const tal_t *ctx, enum tal_notify_type types,
+ void (*callback)(tal_t *, enum tal_notify_type, void *))
+{
+ tal_t *t = debug_tal(to_tal_hdr(ctx));
+ struct notifier *n;
+
+ assert(types);
+ assert((types & ~(TAL_NOTIFY_FREE | TAL_NOTIFY_STEAL | TAL_NOTIFY_MOVE
+ | TAL_NOTIFY_RESIZE | TAL_NOTIFY_RENAME
+ | TAL_NOTIFY_ADD_CHILD | TAL_NOTIFY_DEL_CHILD
+ | TAL_NOTIFY_ADD_NOTIFIER
+ | TAL_NOTIFY_DEL_NOTIFIER)) == 0);
+
+ /* Don't call notifier about itself: set types after! */
+ n = add_notifier_property(t, 0, callback);
+ if (unlikely(!n))
+ return false;
+
+ if (notifiers)
+ notify(t, TAL_NOTIFY_ADD_NOTIFIER, callback);
+
+ n->types = types;
+ if (types != TAL_NOTIFY_FREE)
+ notifiers++;
+ return true;
+}
+
+bool tal_del_notifier_(const tal_t *ctx,
+ void (*callback)(tal_t *, enum tal_notify_type, void *))
+{
+ struct tal_hdr *t = debug_tal(to_tal_hdr(ctx));
+ enum tal_notify_type types;
+
+ types = del_notifier_property(t, callback);
+ if (types) {
+ notify(t, TAL_NOTIFY_DEL_NOTIFIER, callback);
+ if (types != TAL_NOTIFY_FREE)
+ notifiers--;
+ return true;
+ }
+ return false;
+}
+
+bool tal_del_destructor_(const tal_t *ctx, void (*destroy)(void *me))
{
- return add_destructor_property(debug_tal(to_tal_hdr(ctx)), destroy);
+ return tal_del_notifier_(ctx, (void *)destroy);
}
bool tal_set_name_(tal_t *ctx, const char *name, bool literal)
/* Append literal. */
for (p = &t->prop; *p && !is_literal(*p); p = &(*p)->next);
*p = (struct prop_hdr *)name;
- return true;
- }
- if (!add_name_property(t, name))
+ } else if (!add_name_property(t, name))
return false;
+
debug_tal(t);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_RENAME, name);
return true;
}
return n->name;
}
+size_t tal_count(const tal_t *ptr)
+{
+ struct length *l;
+
+ l = find_property(debug_tal(to_tal_hdr(ptr)), LENGTH);
+ if (!l)
+ return 0;
+ return l->count;
+}
+
/* Start one past first child: make stopping natural in circ. list. */
static struct tal_hdr *first_child(struct tal_hdr *parent)
{
return from_tal_hdr(ignore_destroying_bit(t->parent_child)->parent);
}
-bool tal_resize_(tal_t **ctxp, size_t size)
+bool tal_resize_(tal_t **ctxp, size_t size, size_t count)
{
struct tal_hdr *old_t, *t;
struct children *child;
+ struct length *len;
old_t = debug_tal(to_tal_hdr(*ctxp));
- /* Don't hand silly sizes to realloc. */
- if (size >> (CHAR_BIT*sizeof(size) - 1)) {
- call_error("Reallocation size overflow");
+ if (!adjust_size(&size, count))
return false;
- }
t = resizefn(old_t, size + sizeof(struct tal_hdr));
if (!t) {
}
/* If it didn't move, we're done! */
- if (t == old_t)
- return true;
- update_bounds(t, size + sizeof(struct tal_hdr));
-
- /* Fix up linked list pointers. */
- if (list_entry(t->list.next, struct tal_hdr, list) != old_t)
- t->list.next->prev = t->list.prev->next = &t->list;
-
- /* Fix up child property's parent pointer. */
- child = find_property(t, CHILDREN);
- if (child) {
- assert(child->parent == old_t);
- child->parent = t;
+ if (t != old_t) {
+ update_bounds(t, size + sizeof(struct tal_hdr));
+
+ /* Fix up linked list pointers. */
+ if (list_entry(t->list.next, struct tal_hdr, list) != old_t)
+ t->list.next->prev = t->list.prev->next = &t->list;
+
+ /* Fix up child property's parent pointer. */
+ child = find_property(t, CHILDREN);
+ if (child) {
+ assert(child->parent == old_t);
+ child->parent = t;
+ }
+ *ctxp = from_tal_hdr(debug_tal(t));
+ if (notifiers)
+ notify(t, TAL_NOTIFY_MOVE, from_tal_hdr(old_t));
}
- *ctxp = from_tal_hdr(debug_tal(t));
+ len = find_property(t, LENGTH);
+ if (len)
+ len->count = count;
+ if (notifiers)
+ notify(t, TAL_NOTIFY_RESIZE, (void *)size);
+
return true;
}
-char *tal_strdup(const tal_t *ctx, const char *p)
+bool tal_expand_(tal_t **ctxp, const void *src, size_t size, size_t count)
{
- /* We have to let through NULL for take(). */
- return tal_dup(ctx, char, p, p ? strlen(p) + 1: 1, 0);
-}
+ struct length *l;
+ bool ret = false;
-char *tal_strndup(const tal_t *ctx, const char *p, size_t n)
-{
- size_t len;
- char *ret;
+ l = find_property(debug_tal(to_tal_hdr(*ctxp)), LENGTH);
- /* We have to let through NULL for take(). */
- if (likely(p)) {
- len = strlen(p);
- if (len > n)
- len = n;
- } else
- len = n;
+ /* Check for additive overflow */
+ if (l->count + count < count) {
+ call_error("dup size overflow");
+ goto out;
+ }
- ret = tal_dup(ctx, char, p, len, 1);
- if (ret)
- ret[len] = '\0';
+ /* Don't point src inside thing we're expanding! */
+ assert(src < *ctxp
+ || (char *)src >= (char *)(*ctxp) + (size * l->count));
+
+ /* Note: updates l->count. */
+ if (!tal_resize_(ctxp, size, l->count + count))
+ goto out;
+
+ memcpy((char *)*ctxp + size * (l->count - count),
+ src, count * size);
+ ret = true;
+
+out:
+ if (taken(src))
+ tal_free(src);
return ret;
}
-void *tal_dup_(const tal_t *ctx, const void *p, size_t n, size_t extra,
+void *tal_dup_(const tal_t *ctx, const void *p, size_t size,
+ size_t n, size_t extra, bool add_count,
const char *label)
{
void *ret;
+ size_t nbytes = size;
+
+ if (!adjust_size(&nbytes, n)) {
+ if (taken(p))
+ tal_free(p);
+ return NULL;
+ }
- /* Beware overflow! */
- if (n + extra < n || n + extra + sizeof(struct tal_hdr) < n) {
+ /* Beware addition overflow! */
+ if (n + extra < n) {
call_error("dup size overflow");
if (taken(p))
tal_free(p);
if (taken(p)) {
if (unlikely(!p))
return NULL;
- if (unlikely(!tal_resize_((void **)&p, n + extra)))
+ if (unlikely(!tal_resize_((void **)&p, size, n + extra)))
return tal_free(p);
if (unlikely(!tal_steal(ctx, p)))
return tal_free(p);
return (void *)p;
}
- ret = tal_alloc_(ctx, n + extra, false, label);
- if (ret)
- memcpy(ret, p, n);
- return ret;
-}
-
-char *tal_asprintf(const tal_t *ctx, const char *fmt, ...)
-{
- va_list ap;
- char *ret;
-
- va_start(ap, fmt);
- ret = tal_vasprintf(ctx, fmt, ap);
- va_end(ap);
+ ret = tal_alloc_arr_(ctx, size, n + extra, false, add_count, label);
+ if (ret)
+ memcpy(ret, p, nbytes);
return ret;
}
-char *tal_vasprintf(const tal_t *ctx, const char *fmt, va_list ap)
-{
- size_t max;
- char *buf;
- int ret;
-
- if (!fmt && taken(fmt))
- return NULL;
-
- /* A decent guess to start. */
- max = strlen(fmt) * 2;
- buf = tal_arr(ctx, char, max);
- while (buf) {
- va_list ap2;
-
- va_copy(ap2, ap);
- ret = vsnprintf(buf, max, fmt, ap2);
- va_end(ap2);
-
- if (ret < max)
- break;
- if (!tal_resize(&buf, max *= 2))
- buf = tal_free(buf);
- }
- if (taken(fmt))
- tal_free(fmt);
- return buf;
-}
-
void tal_set_backend(void *(*alloc_fn)(size_t size),
void *(*resize_fn)(void *, size_t size),
void (*free_fn)(void *),
printf("%p", t);
for (p = t->prop; p; p = p->next) {
struct children *c;
- struct destructor *d;
struct name *n;
+ struct notifier *no;
+ struct length *l;
if (is_literal(p)) {
printf(" \"%s\"", (const char *)p);
break;
p, c->parent,
c->children.n.prev, c->children.n.next);
break;
- case DESTRUCTOR:
- d = (struct destructor *)p;
- printf(" DESTRUCTOR(%p):fn=%p", p, d->destroy);
- break;
case NAME:
n = (struct name *)p;
printf(" NAME(%p):%s", p, n->name);
break;
+ case NOTIFIER:
+ no = (struct notifier *)p;
+ printf(" NOTIFIER(%p):fn=%p", p, no->u.notifyfn);
+ break;
+ case LENGTH:
+ l = (struct length *)p;
+ printf(" LENGTH(%p):count=%zu", p, l->count);
+ break;
default:
printf(" **UNKNOWN(%p):%i**", p, p->type);
}
struct prop_hdr *p;
struct name *name = NULL;
struct children *children = NULL;
+ struct length *length = NULL;
if (!in_bounds(t))
return check_err(t, errorstr, "invalid pointer");
"has two child nodes");
children = (struct children *)p;
break;
- case DESTRUCTOR:
+ case LENGTH:
+ if (length)
+ return check_err(t, errorstr,
+ "has two lengths");
+ length = (struct length *)p;
+ break;
+ case NOTIFIER:
break;
case NAME:
if (name)