Mercurial > prosody-hg
comparison core/moduleapi.lua @ 14139:374b72785488 13.0
moduleapi: Use multitable add/remove instead of set
multitable:set() does not clear intermediate keys when setting the last one to
nil. This meant that the event_handlers multitable for every module was not
properly cleaning up the object and event name from the table when calling
:unhook_object_event().
This combined badly with e.g. mod_bookmarks, which uses this extensively to
add/remove hooks dynamically for mod_pep services. The multitable kept a
reference to every mod_pep service object ever created, causing a memory leak.
The multitable:remove() function clears intermediate keys when they are empty,
so we've switched to using that now.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 17 Apr 2026 17:39:06 +0100 |
| parents | 3e6bb6ffbd43 |
| children | 5aacae4b2ccf e3ddbf7f2d3f |
comparison
equal
deleted
inserted
replaced
| 14137:368df9b2d511 | 14139:374b72785488 |
|---|---|
| 81 function api:fire_event(...) | 81 function api:fire_event(...) |
| 82 return (hosts[self.host] or prosody).events.fire_event(...); | 82 return (hosts[self.host] or prosody).events.fire_event(...); |
| 83 end | 83 end |
| 84 | 84 |
| 85 function api:hook_object_event(object, event, handler, priority) | 85 function api:hook_object_event(object, event, handler, priority) |
| 86 self.event_handlers:set(object, event, handler, true); | 86 self.event_handlers:add(object, event, handler, true); |
| 87 return object.add_handler(event, handler, priority); | 87 return object.add_handler(event, handler, priority); |
| 88 end | 88 end |
| 89 | 89 |
| 90 function api:unhook_object_event(object, event, handler) | 90 function api:unhook_object_event(object, event, handler) |
| 91 self.event_handlers:set(object, event, handler, nil); | 91 self.event_handlers:remove(object, event, handler); |
| 92 return object.remove_handler(event, handler); | 92 return object.remove_handler(event, handler); |
| 93 end | 93 end |
| 94 | 94 |
| 95 function api:hook(event, handler, priority) | 95 function api:hook(event, handler, priority) |
| 96 return self:hook_object_event((hosts[self.host] or prosody).events, event, handler, priority); | 96 return self:hook_object_event((hosts[self.host] or prosody).events, event, handler, priority); |
