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)
{
return prop;
}
-static bool del_notifier_property(struct tal_hdr *t,
- void (*fn)(tal_t *,
- enum tal_notify_type, void *))
+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;
continue;
n = (struct notifier *)*p;
if (n->u.notifyfn == fn) {
+ enum tal_notify_type types = n->types;
*p = (*p)->next;
freefn(n);
- return true;
+ return types & ~NOTIFY_IS_DESTRUCTOR;
}
}
- return false;
+ return 0;
}
static struct name *add_name_property(struct tal_hdr *t, const char *name)
return NULL;
}
debug_tal(parent);
- notify(parent, TAL_NOTIFY_ADD_CHILD, from_tal_hdr(debug_tal(child)));
+ if (notifiers)
+ notify(parent, TAL_NOTIFY_ADD_CHILD, from_tal_hdr(child));
return from_tal_hdr(debug_tal(child));
}
struct tal_hdr *t;
int saved_errno = errno;
t = debug_tal(to_tal_hdr(ctx));
- notify(ignore_destroying_bit(t->parent_child)->parent,
- TAL_NOTIFY_DEL_CHILD, ctx);
+ if (notifiers)
+ notify(ignore_destroying_bit(t->parent_child)->parent,
+ TAL_NOTIFY_DEL_CHILD, ctx);
list_del(&t->list);
del_tree(t, ctx);
errno = saved_errno;
return NULL;
}
debug_tal(newpar);
- notify(t, TAL_NOTIFY_STEAL, new_parent);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_STEAL, new_parent);
}
return (void *)ctx;
}
if (unlikely(!n))
return false;
- notify(t, TAL_NOTIFY_ADD_NOTIFIER, callback);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_ADD_NOTIFIER, callback);
+
n->types = types;
+ if (types != TAL_NOTIFY_FREE)
+ notifiers++;
return true;
}
void (*callback)(tal_t *, enum tal_notify_type, void *))
{
struct tal_hdr *t = debug_tal(to_tal_hdr(ctx));
- bool ret;
+ enum tal_notify_type types;
- ret = del_notifier_property(t, callback);
- if (ret)
+ types = del_notifier_property(t, callback);
+ if (types) {
notify(t, TAL_NOTIFY_DEL_NOTIFIER, callback);
- return ret;
+ if (types != TAL_NOTIFY_FREE)
+ notifiers--;
+ return true;
+ }
+ return false;
}
bool tal_del_destructor_(tal_t *ctx, void (*destroy)(void *me))
return false;
debug_tal(t);
- notify(t, TAL_NOTIFY_RENAME, name);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_RENAME, name);
return true;
}
child->parent = t;
}
*ctxp = from_tal_hdr(debug_tal(t));
- notify(t, TAL_NOTIFY_MOVE, from_tal_hdr(old_t));
+ if (notifiers)
+ notify(t, TAL_NOTIFY_MOVE, from_tal_hdr(old_t));
}
- notify(t, TAL_NOTIFY_RESIZE, (void *)size);
+ if (notifiers)
+ notify(t, TAL_NOTIFY_RESIZE, (void *)size);
return true;
}