deadlock in download abort plus code cleanup

4 files changed, 61 insertions, 24 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 5bbb2586..ebe9fd41 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -447,4 +447,38 @@ void doneGNUnetGTKCommon() {
   MUTEX_DESTROY(&sclock);
 }
 
+struct rwsc_closure {
+  Semaphore * sig;
+  PThreadMain realMain;
+  void * arg;
+};
+
+static void * shutdownCode(void * arg) {
+  struct rwsc_closure * cls = arg;
+  void * ret;
+
+  ret = cls->realMain(cls->arg);
+  SEMAPHORE_UP(cls->sig);
+  return ret;
+}
+
+void run_with_save_calls(PThreadMain cb,
+                         void * arg) {
+ PTHREAD_T doneThread;
+ Semaphore * sig;
+ void * unused;
+ 
+  sig = SEMAPHORE_NEW(0);
+  if (0 != PTHREAD_CREATE(&doneThread,
+                          &shutdownCode,
+                          sig,
+                          64*1024))
+    DIE_STRERROR("pthread_create");
+  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
+    gtkRunSomeSaveCalls();
+  PTHREAD_JOIN(&doneThread,
+               &unused);
+  SEMAPHORE_FREE(sig);
+}
+
 /* end of helper.c */
diff --git a/src/core/main.c b/src/core/main.c
index 977e041e..ca9919a5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -88,20 +88,15 @@ static int parseOptions(int argc,
   return OK;
 }
 
-static void * shutdownCode(void * arg) {
-  Semaphore * sig = arg;
+static void * shutdownCode(void * unused) {
   stopCron();
   doneGNUnetGTKCommon();
-  SEMAPHORE_UP(sig);
   return NULL;
 }
 
 int main(int argc, 
          char *argv[]) {
   GtkWidget * root;
-  PTHREAD_T doneThread;
-  Semaphore * sig;
-  void * unused;
   
   g_thread_init(NULL);
   gtk_init(&argc, &argv);
@@ -133,18 +128,8 @@ int main(int argc,
   gtk_main();
   gdk_threads_leave();
   setCustomLogProc(NULL);
-
-  sig = SEMAPHORE_NEW(0);
-  if (0 != PTHREAD_CREATE(&doneThread,
-                          &shutdownCode,
-                          sig,
-                          64*1024))
-    DIE_STRERROR("pthread_create");
-  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
-    gtkRunSomeSaveCalls();
-  PTHREAD_JOIN(&doneThread,
-               &unused);
-  SEMAPHORE_FREE(sig);
+  run_with_save_calls(&shutdownCode,
+                      NULL);
   doneUtil();
   
   return 0;
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index d3b7c265..50cdca3f 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -80,6 +80,15 @@ void gtkSaveCall(SimpleCallback func,
 int gtkRunSomeSaveCalls();
 
 /**
+ * Run the given "cb" function and save calls
+ * in parallel (used within the event loop to
+ * keep save calls going while something else
+ * happens).
+ */
+void run_with_save_calls(PThreadMain cb,
+                         void * arg);
+
+/**
  * Bind handlers defined by the various
  * plugins to the signals defined by the
  * Glade XML.
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 3defe98f..5abbd3ae 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -413,15 +413,14 @@ void on_clearCompletedDownloadsButton_clicked(void * unused,
                                NULL);
 }
 
-static void abortDownloadCallback(GtkTreeModel * model,
-                                  GtkTreePath * path,
-                                  GtkTreeIter * iter,
-                                  GtkTreeStore * tree) {
+static void * shutdownCode(void * it) {
+  GtkTreeModel * model;
+  GtkTreeIter * iter = it; 
   struct ECRS_URI * u;
   char * fn;
 
-  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
-  gtk_tree_model_get(GTK_TREE_MODEL(summary),
+  model = GTK_TREE_MODEL(summary);
+  gtk_tree_model_get(model,
                      iter,
                      DOWNLOAD_URI, &u,
                      DOWNLOAD_FILENAME, &fn,
@@ -433,6 +432,16 @@ static void abortDownloadCallback(GtkTreeModel * model,
                         iter);
   if (u != NULL)
     ECRS_freeUri(u);  
+  return NULL;
+}
+
+static void abortDownloadCallback(GtkTreeModel * model,
+                                  GtkTreePath * path,
+                                  GtkTreeIter * iter,
+                                  GtkTreeStore * tree) {
+  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
+  run_with_save_calls(&shutdownCode,
+                      iter);
 }
 
 void on_abortDownloadButton_clicked(void * unused,