implementing new scheduler shutdown semantics

12 files changed, 21 insertions, 36 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 82b472a4..c091f7fb 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -191,9 +191,8 @@ run (void *cls,
     gtk_widget_show (main_window);
     gtk_window_present (GTK_WINDOW (main_window));
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
   if (NULL == ego_name)
     ego_name = GNUNET_strdup ("master-zone");
   GCG_HISTORY_init ();
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index 8bc5050d..e8e1eede 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -317,11 +317,9 @@ GSC_add_phone (const gchar *label,
  * Asynchronously disconnect from the namestore.
  *
  * @param cls closure (NULL)
- * @param tc scheduler context
  */
 static void
-async_disconnect (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+async_disconnect (void *cls)
 {
   if (NULL != ns)
   {
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 58db7609..d7266eac 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -337,10 +337,7 @@ GNUNET_FS_GTK_delete_event_cb (GtkWidget *object,
    * just to be sure it is dead (if it isn't, application will hang up).
    */
   GNUNET_SCHEDULER_shutdown ();
-
   GNUNET_GTK_tray_icon_destroy ();
-  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                      &shutdown_task, NULL);
 }
 
 
@@ -842,10 +839,7 @@ run (void *cls)
                    argv[i]);
       }
   }
-
-
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
 
diff --git a/src/identity/gnunet-identity-gtk.c b/src/identity/gnunet-identity-gtk.c
index 3edb7bb4..62f6c171 100644
--- a/src/identity/gnunet-identity-gtk.c
+++ b/src/identity/gnunet-identity-gtk.c
@@ -534,8 +534,7 @@ run (void *cls)
   identity = GNUNET_IDENTITY_connect (GIG_get_configuration (),
                                       &add_ego,
                                       NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
 
diff --git a/src/lib/animations.c b/src/lib/animations.c
index 16fa883d..ce030f70 100644
--- a/src/lib/animations.c
+++ b/src/lib/animations.c
@@ -121,7 +121,7 @@ static struct GNUNET_GTK_AnimationTreeViewHandle *atv_tail;
 /**
  * Task run to update animations.
  */
-static struct GNUNET_SCHEDULER_Task * ticker_task;
+static struct GNUNET_SCHEDULER_Task *ticker_task;
 
 
 /**
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 50b294f8..3e03a085 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -106,7 +106,7 @@ struct GNUNET_GTK_MainLoop
   /**
    * Task we keep around just to keep the event loop running.
    */
-  struct GNUNET_SCHEDULER_Task * dummy_task;
+  struct GNUNET_SCHEDULER_Task *dummy_task;
 
   /**
    * Remaining command-line arguments.
@@ -359,9 +359,9 @@ keepalive_task (void *cls)
   struct GNUNET_GTK_MainLoop *ml = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Dummy task was scheduled\n");
-  ml->dummy_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    &keepalive_task, ml);
+  ml->dummy_task
+    = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    &keepalive_task, ml);
 }
 
 
@@ -912,7 +912,8 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error (i.e. bad command-line options, etc)
  */
 int
-GNUNET_GTK_main_loop_start (const char *binary_name, const char *binary_help,
+GNUNET_GTK_main_loop_start (const char *binary_name,
+                            const char *binary_help,
                             int argc, char *const *argv,
                             struct GNUNET_GETOPT_CommandLineOption *options,
                             const char *main_window_file,
@@ -925,7 +926,8 @@ GNUNET_GTK_main_loop_start (const char *binary_name, const char *binary_help,
   ml.main_window_file = main_window_file;
   ml.main_task = main_task;
   ret =
-      GNUNET_PROGRAM_run (argc, argv, binary_name, binary_help, options,
+      GNUNET_PROGRAM_run (argc, argv, binary_name,
+                          binary_help, options,
                           &run_main_loop, &ml);
   if (NULL != ml.cached_poll_array)
     g_free (ml.cached_poll_array);
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index 8d01a718..7837c75e 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -316,8 +316,7 @@ run (void *cls)
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
   main_window = GTK_WIDGET (get_object ("gnunet_gtk_window"));
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
 #ifdef GDK_WINDOWING_X11
   plug ("gnunet_statistics_hbox",
         "gnunet-statistics-gtk",
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 7f686086..750e1810 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -2823,8 +2823,7 @@ run (void *cls)
                                       NULL);
   gtk_widget_show (main_window);
   gtk_window_present (GTK_WINDOW (main_window));
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
 }
 
 
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index c98a1839..f5a3f6f2 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -1678,8 +1678,7 @@ run (void *cts,
     gtk_widget_show (main_window);
     gtk_window_present (GTK_WINDOW (main_window));
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
 
diff --git a/src/setup/gnunet-setup-namestore-config.c b/src/setup/gnunet-setup-namestore-config.c
index d6cf756b..d03ca554 100644
--- a/src/setup/gnunet-setup-namestore-config.c
+++ b/src/setup/gnunet-setup-namestore-config.c
@@ -31,7 +31,7 @@
  * Test if the configuration works for the given plugin.
  *
  * @param name name of the plugin to check
- * @return GNUNET_OK on success, GNUNET_SYSERR if the config is wrong
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if the config is wrong
  */
 static int
 test_config (const char *name)
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index d70f5bf9..7ab9ca70 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -663,8 +663,7 @@ run (void *cls)
                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &start_identity, NULL);
   load_options ();
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
   if (do_autoconfig)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index 57beed7f..0eef7e44 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -198,15 +198,13 @@ create_plot (const char *box_name, const struct PlotInfo *info)
 }
 
 
-
 /**
  * Task run on shutdown.
  *
  * @param cls unused
- * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
@@ -280,8 +278,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     gtk_widget_show (main_window);
     gtk_window_present (GTK_WINDOW (main_window));
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }