oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: move libdbus cleanup to class ODBus::ScopeInit

Browse Source
This commit is contained in:
Max Kellermann 2018-08-01 19:24:50 +02:00
parent 7aa8497546
commit 8d2101ccb4
3 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -287,6 +287,7 @@ ALSA_SOURCES = \
if ENABLE_DBUS if ENABLE_DBUS
noinst_LIBRARIES += libodbus.a noinst_LIBRARIES += libodbus.a
libodbus_a_SOURCES = \ libodbus_a_SOURCES = \
src/lib/dbus/Init.hxx \
src/lib/dbus/AppendIter.hxx \ src/lib/dbus/AppendIter.hxx \
src/lib/dbus/AsyncRequest.hxx \ src/lib/dbus/AsyncRequest.hxx \
src/lib/dbus/Connection.cxx src/lib/dbus/Connection.hxx \ src/lib/dbus/Connection.cxx src/lib/dbus/Connection.hxx \

17
src/Main.cxx
View File

@ -97,12 +97,12 @@
#include "org_musicpd_Bridge.h" #include "org_musicpd_Bridge.h"
#endif #endif
#ifdef ENABLE_SYSTEMD_DAEMON #ifdef ENABLE_DBUS
#include <systemd/sd-daemon.h> #include "lib/dbus/Init.hxx"
#endif #endif
#ifdef ENABLE_DBUS #ifdef ENABLE_SYSTEMD_DAEMON
#include <dbus/dbus.h> #include <systemd/sd-daemon.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -469,6 +469,10 @@ try {
const ScopeNetInit net_init; const ScopeNetInit net_init;
#ifdef ENABLE_DBUS
const ODBus::ScopeInit dbus_init;
#endif
config_global_init(); config_global_init();
#ifdef ANDROID #ifdef ANDROID
@ -708,11 +712,6 @@ try {
log_deinit(); log_deinit();
#ifdef ENABLE_DBUS
/* free libdbus memory to make memory leak checkers happy */
dbus_shutdown();
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} catch (const std::exception &e) { } catch (const std::exception &e) {
LogError(e); LogError(e);

52
src/lib/dbus/Init.hxx Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2018 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ODBUS_INIT_HXX
#define ODBUS_INIT_HXX
#include <dbus/dbus.h>
namespace ODBus {
class ScopeInit {
public:
ScopeInit() = default;
~ScopeInit() noexcept {
/* free libdbus memory to make memory leak checkers happy */
dbus_shutdown();
}
ScopeInit(const ScopeInit &) = delete;
ScopeInit &operator=(const ScopeInit &) = delete;
};
} /* namespace ODBus */
#endif