Work around Pegasus destroying threads _after_ unloading provider dynamic library.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/openlmi.c b/src/openlmi.c
index 1dc1b62..a13fc50 100644
--- a/src/openlmi.c
+++ b/src/openlmi.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <cmpimacs.h>
 #include <glib.h>
+#include <dlfcn.h>
 
 static char *_system_name = NULL;
 static CMPIObjectPath *_computer_system = NULL;
@@ -261,6 +262,8 @@ void lmi_init(const char *provider, const CMPIBroker *cb,
               const CMPIContext *ctx,
               const ConfigEntry *provider_config_defaults)
 {
+    static void *glib_loaded = 0;
+
     pthread_mutex_lock(&_init_mutex);
     // Broker can change between threads
     _cb = cb;
@@ -290,6 +293,18 @@ void lmi_init(const char *provider, const CMPIBroker *cb,
         get_computer_system(cb, ctx);
     }
 
+    /*
+     * Ugly hack to prevent Pegasus from crashing on cleanup.
+     * Glib2 adds some thread shutdown callback (see man pthread_key_create),
+     * but when cimprovagt destroys threads, this provider is already dlclosed().
+     * So keep the libglib in memory so the callback does not crash.
+     * https://bugzilla.redhat.com/show_bug.cgi?id=1010238
+     */
+    if (!glib_loaded) {
+        glib_loaded = dlopen("libglib-2.0.so.0", RTLD_LAZY);
+        lmi_info("Loaded glib: %p\n", glib_loaded);
+    }
+
     pthread_mutex_unlock(&_init_mutex);
 }