merge CleanupGuard into MythContext

mythtv/libs/libmyth/mythcontext.cpp

@@ -1664,6 +1664,11 @@ bool MythContext::Init(const bool gui,
 
 MythContext::~MythContext()
 {
+    if (m_cleanup != nullptr)
+    {
+        m_cleanup();
+    }
+
     if (m_impl->m_gui)
     {
         DestroyMythMainWindow();

mythtv/libs/libmyth/mythcontext.h

@@ -27,6 +27,9 @@ class MPUBLIC MythContext
               bool disableAutoDiscovery = false,
               bool ignoreDB = false);
 
+    using CleanupFunction = void (*)();
+    void setCleanup(CleanupFunction cleanup) { m_cleanup = cleanup; }
+
     bool saveSettingsCache();
 
     void SetDisableEventPopup(bool check);
@@ -37,6 +40,11 @@ class MPUBLIC MythContext
     class Impl;
     Impl   *m_impl {nullptr}; ///< PIMPL idiom
     QString             m_appBinaryVersion;
+    /**
+    This is used to destroy global state before main() returns.  It is called
+    first before anything else is done in ~MythContext() if it is not nullptr.
+    */
+    CleanupFunction     m_cleanup {nullptr};
 };
 
 #endif

mythtv/libs/libmythbase/CMakeLists.txt

@@ -83,7 +83,6 @@ set(LIBMYTHBASE_HEADERS
 
 set(LIBMYTHBASE_HEADERS_NOT_INSTALLED
     mythbinaryplist.h
-    cleanupguard.h
     configuration.h
     housekeeper.h
     logging.h
@@ -145,7 +144,6 @@ add_library(
   ${LIBMYTHBASE_HEADERS}
   ${LIBMYTHBASE_HEADERS_NOT_INSTALLED}
   ${LIBMYTHBASE_HTTP_HEADERS}
-  cleanupguard.cpp
   configuration.cpp
   dbcheckcommon.cpp
   dbutil.cpp

mythtv/libs/libmythbase/libmythbase.pro

@@ -36,7 +36,7 @@ HEADERS += mythsystemlegacy.h mythtypes.h
 HEADERS += threadedfilewriter.h mythsingledownload.h
 HEADERS += ternarycompare.h
 HEADERS += mythsession.h
-HEADERS += cleanupguard.h portchecker.h
+HEADERS += portchecker.h
 HEADERS += mythsorthelper.h mythdbcheck.h
 HEADERS += mythpower.h
 HEADERS += configuration.h
@@ -75,7 +75,7 @@ SOURCES += mythrandom.cpp
 SOURCES += stringutil.cpp
 SOURCES += threadedfilewriter.cpp mythsingledownload.cpp
 SOURCES += mythsession.cpp
-SOURCES += cleanupguard.cpp portchecker.cpp
+SOURCES += portchecker.cpp
 SOURCES += mythsorthelper.cpp dbcheckcommon.cpp
 SOURCES += mythpower.cpp
 SOURCES += configuration.cpp

mythtv/programs/mythbackend/mythbackend.cpp

@@ -25,7 +25,6 @@
 
 // MythTV
 #include "libmyth/mythcontext.h"
-#include "libmythbase/cleanupguard.h"
 #include "libmythbase/compat.h"
 #include "libmythbase/configuration.h"
 #include "libmythbase/exitcodes.h"
@@ -156,7 +155,7 @@ int main(int argc, char **argv)
         LOG(VB_GENERAL, LOG_CRIT, "Failed to init MythContext.");
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
-    CleanupGuard callCleanup(cleanup);
+    context.setCleanup(cleanup);
 
     MythTranslation::load("mythfrontend");
 

mythtv/programs/mythfrontend/mythfrontend.cpp

@@ -35,7 +35,6 @@
 #include "libmythui/langsettings.h"
 #include "libmyth/mythcontext.h"
 #include "libmythui/standardsettings.h"
-#include "libmythbase/cleanupguard.h"
 #include "libmythbase/compat.h"  // For SIG* on MinGW
 #include "libmythbase/exitcodes.h"
 #include "libmythbase/hardwareprofile.h"
@@ -2053,7 +2052,7 @@ Q_DECL_EXPORT int main(int argc, char **argv)
         gCoreContext->SetExiting(true);
         return GENERIC_EXIT_NO_MYTHCONTEXT;
     }
-    CleanupGuard callCleanup(cleanup);
+    context.setCleanup(cleanup);
 
     SignalHandler::SetHandler(SIGUSR1, handleSIGUSR1);
     SignalHandler::SetHandler(SIGUSR2, handleSIGUSR2);