//#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
};
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 notifier {
struct prop_hdr hdr; /* NOTIFIER */
enum tal_notify_type types;
- void (*notifyfn)(tal_t *, enum tal_notify_type, void *);
+ union {
+ void (*notifyfn)(tal_t *, enum tal_notify_type, void *);
+ void (*destroy)(tal_t *); /* If NOTIFY_IS_DESTRUCTOR set */
+ } u;
};
static struct {
if (p->type != NOTIFIER)
continue;
n = (struct notifier *)p;
- if (n->types & type)
- n->notifyfn(from_tal_hdr(ctx), type, (void *)info);
+ 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);
+ }
}
}
parent->prop = hdr;
}
-static struct destructor *add_destructor_property(struct tal_hdr *t,
- void (*destroy)(void *))
-{
- struct destructor *prop = allocate(sizeof(*prop));
- if (prop) {
- init_property(&prop->hdr, t, DESTRUCTOR);
- prop->destroy = destroy;
- }
- return prop;
-}
-
-static bool del_destructor_property(struct tal_hdr *t,
- void (*destroy)(void *))
-{
- struct prop_hdr **p;
-
- for (p = (struct prop_hdr **)&t->prop; *p; p = &(*p)->next) {
- struct destructor *d;
-
- if (is_literal(*p))
- break;
- if ((*p)->type != DESTRUCTOR)
- continue;
- d = (struct destructor *)*p;
- if (d->destroy == destroy) {
- *p = (*p)->next;
- freefn(d);
- return true;
- }
- }
- return false;
-}
-
static struct notifier *add_notifier_property(struct tal_hdr *t,
enum tal_notify_type types,
void (*fn)(void *,
if (prop) {
init_property(&prop->hdr, t, NOTIFIER);
prop->types = types;
- prop->notifyfn = fn;
+ prop->u.notifyfn = fn;
}
return prop;
}
if ((*p)->type != NOTIFIER)
continue;
n = (struct notifier *)*p;
- if (n->notifyfn == fn) {
+ if (n->u.notifyfn == fn) {
*p = (*p)->next;
freefn(n);
return true;
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);
bool tal_add_destructor_(tal_t *ctx, void (*destroy)(void *me))
{
tal_t *t = debug_tal(to_tal_hdr(ctx));
- return add_destructor_property(t, destroy);
+ return add_notifier_property(t, TAL_NOTIFY_FREE|NOTIFY_IS_DESTRUCTOR,
+ (void *)destroy);
}
bool tal_add_notifier_(tal_t *ctx, enum tal_notify_type types,
bool tal_del_destructor_(tal_t *ctx, void (*destroy)(void *me))
{
- struct tal_hdr *t = debug_tal(to_tal_hdr(ctx));
- return del_destructor_property(t, destroy);
+ return tal_del_notifier_(ctx, (void *)destroy);
}
bool tal_set_name_(tal_t *ctx, const char *name, bool literal)
printf("%p", t);
for (p = t->prop; p; p = p->next) {
struct children *c;
- struct destructor *d;
struct name *n;
struct notifier *no;
if (is_literal(p)) {
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->notifyfn);
+ printf(" NOTIFIER(%p):fn=%p", p, no->u.notifyfn);
break;
default:
printf(" **UNKNOWN(%p):%i**", p, p->type);
"has two child nodes");
children = (struct children *)p;
break;
- case DESTRUCTOR:
case NOTIFIER:
break;
case NAME: