Skip to content
Permalink
Browse files

Fully shutdown DBUS on systemd_inhibit cleanup (RhBug:1714657)

dbus_shutdown() frees internal DBUS memory allocations that will otherwise
show up as memory leaks. This is of little consequence in practise
but shuts up valgrind...
  • Loading branch information...
pmatilai authored and ffesti committed May 29, 2019
1 parent 475af64 commit d5f201345f6d27b6280750e5c6502f4418614fbc
Showing with 6 additions and 0 deletions.
  1. +6 −0 plugins/systemd_inhibit.c
@@ -80,6 +80,11 @@ static rpmRC systemd_inhibit_init(rpmPlugin plugin, rpmts ts)
return RPMRC_NOTFOUND;
}

static void systemd_inhibit_cleanup(rpmPlugin plugin)
{
dbus_shutdown();
}

static rpmRC systemd_inhibit_tsm_pre(rpmPlugin plugin, rpmts ts)
{
if (rpmtsFlags(ts) & (RPMTRANS_FLAG_TEST|RPMTRANS_FLAG_BUILD_PROBS))
@@ -106,6 +111,7 @@ static rpmRC systemd_inhibit_tsm_post(rpmPlugin plugin, rpmts ts, int res)

struct rpmPluginHooks_s systemd_inhibit_hooks = {
.init = systemd_inhibit_init,
.cleanup = systemd_inhibit_cleanup,
.tsm_pre = systemd_inhibit_tsm_pre,
.tsm_post = systemd_inhibit_tsm_post,
};

0 comments on commit d5f2013

Please sign in to comment.
You can’t perform that action at this time.