Mercurial > prosody-hg
comparison core/moduleapi.lua @ 14157:f881ed0ee8bd 0.12
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 | 2fb79fe54390 |
| children | e3ddbf7f2d3f |
comparison
equal
deleted
inserted
replaced
| 14156:57d8b5c5a4e7 | 14157:f881ed0ee8bd |
|---|---|
| 79 function api:fire_event(...) | 79 function api:fire_event(...) |
| 80 return (hosts[self.host] or prosody).events.fire_event(...); | 80 return (hosts[self.host] or prosody).events.fire_event(...); |
| 81 end | 81 end |
| 82 | 82 |
| 83 function api:hook_object_event(object, event, handler, priority) | 83 function api:hook_object_event(object, event, handler, priority) |
| 84 self.event_handlers:set(object, event, handler, true); | 84 self.event_handlers:add(object, event, handler, true); |
| 85 return object.add_handler(event, handler, priority); | 85 return object.add_handler(event, handler, priority); |
| 86 end | 86 end |
| 87 | 87 |
| 88 function api:unhook_object_event(object, event, handler) | 88 function api:unhook_object_event(object, event, handler) |
| 89 self.event_handlers:set(object, event, handler, nil); | 89 self.event_handlers:remove(object, event, handler); |
| 90 return object.remove_handler(event, handler); | 90 return object.remove_handler(event, handler); |
| 91 end | 91 end |
| 92 | 92 |
| 93 function api:hook(event, handler, priority) | 93 function api:hook(event, handler, priority) |
| 94 return self:hook_object_event((hosts[self.host] or prosody).events, event, handler, priority); | 94 return self:hook_object_event((hosts[self.host] or prosody).events, event, handler, priority); |
