handle logs during shutdown

4 files changed, 19 insertions, 1 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 1090fefa..864051a9 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -142,6 +142,7 @@ GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *args)
   GNUNET_mutex_lock (sclock);
   if ((saveCallsUp == GNUNET_NO) || (!GNUNET_thread_test_self (mainThread)))
     {
+      GNUNET_GE_ASSERT(NULL, saveCallsUp != GNUNET_SYSERR);
       call.args = args;
       call.func = func;
       call.sem = GNUNET_semaphore_create (0);
@@ -417,6 +418,7 @@ GNUNET_GTK_shutdown_plugins ()
       i = pscCount;
       GNUNET_mutex_unlock (sclock);
     }
+  saveCallsUp = GNUNET_SYSERR;
 }
 
 void
diff --git a/src/common/logging.c b/src/common/logging.c
index 677c4783..e5ddcea8 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -32,6 +32,8 @@
 
 static GtkWidget *infoWindowTextView;
 
+static int is_shutdown;
+
 static void
 init ()
 {
@@ -127,6 +129,8 @@ GNUNET_GTK_add_log_entry (const char *txt, ...)
   va_list args;
   gchar *note;
 
+  if (is_shutdown)
+    return;
   va_start (args, txt);
   note = g_strdup_vprintf (txt, args);
   va_end (args);
@@ -139,9 +143,17 @@ static void
 ge_gtk_log_handler (void *ctx,
                     GNUNET_GE_KIND kind, const char *date, const char *msg)
 {
+  if (is_shutdown)
+    return;
   GNUNET_GTK_show_info_message ("%s: %s", date, msg);
 }
 
+void 
+GNUNET_GTK_shutdown_logger()
+{
+  is_shutdown = GNUNET_YES;
+}
+
 struct GNUNET_GE_Context *
 GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask)
 {
diff --git a/src/core/main.c b/src/core/main.c
index 52dc2a12..cd8062de 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -159,8 +159,9 @@ main (int argc, char *const *argv)
   gtk_main ();
   gdk_threads_leave ();
   GNUNET_GE_setDefaultContext (ectx);
+  GNUNET_GTK_shutdown_logger();
+  GNUNET_GTK_shutdown_common_library (); 
   GNUNET_GE_free_context (my_ctx);
-  GNUNET_GTK_shutdown_common_library ();
   GNUNET_fini (ectx, cfg);
   return 0;
 }
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index ff8e9034..678a5a71 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -91,6 +91,9 @@ void GNUNET_GTK_add_log_entry (const char *txt, ...);
 
 struct GNUNET_GE_Context *GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask);
 
+void 
+GNUNET_GTK_shutdown_logger();
+
 #define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
 #define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1
 #define GNUNET_GTK_NOTIFY_LEVEL_CRITICAL 2