1 files changed, 20 insertions, 28 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 1307401a..826aa1ee 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -78,6 +78,7 @@ static gboolean saveCallWrapper(gpointer data) {
   SaveCall * call = data;
   int i;
 
+  printf("Running save call!\n");
   /* clearly, we are no longer pending,
      so remove from psc */
   if (call->sem != NULL) {
@@ -98,6 +99,7 @@ static gboolean saveCallWrapper(gpointer data) {
   call->func(call->args);
   if (call->sem != NULL)
     SEMAPHORE_UP(call->sem);
+  printf("Running save call done.\n");
   return FALSE;
 }
 
@@ -132,32 +134,6 @@ void gtkSaveCall(SimpleCallback func,
   }
 }
 
-int gtkRunSomeSaveCalls() {
-  int i;
-
-  if (! PTHREAD_SELF_TEST(&mainThread))
-    return NO;
-  MUTEX_LOCK(&sclock);
-  if (pscCount == 0) {
-    MUTEX_UNLOCK(&sclock);
-    return NO;
-  }
-  i = randomi(pscCount);
-  if (TRUE == g_idle_remove_by_data(psc[i]))
-    saveCallWrapper(psc[i]);
-  MUTEX_UNLOCK(&sclock);
-  gnunet_util_sleep(50 * cronMILLIS);
-  /* sleep here is somewhat important, first of
-     all, after completion we need to give the
-     semaphore-mechanism time to remove the save-call
-     from the list to avoid running it twice;
-     also, this function might be called in a tight
-     loop (see search.c), so we should give the
-     other threads some time to run.  */
-
-  return YES;
-}
-
 /**
  * Callback for handling "delete_event": close the window
  */
@@ -483,6 +459,7 @@ static void * shutdownCode(void * arg) {
 
   ret = cls->realMain(cls->arg);
   SEMAPHORE_UP(cls->sig);
+  PTHREAD_KILL(&mainThread, SIGALRM);
   return ret;
 }
 
@@ -491,6 +468,7 @@ void run_with_save_calls(PThreadMain cb,
   PTHREAD_T doneThread;
   void * unused;
   struct rwsc_closure cls;
+  int i;
 
   cls.sig = SEMAPHORE_NEW(0);
   cls.realMain = cb;
@@ -500,8 +478,22 @@ void run_with_save_calls(PThreadMain cb,
                           &cls,
                           64*1024))
     DIE_STRERROR("pthread_create");
-  while (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig))
-    gtkRunSomeSaveCalls();
+  if ( (! PTHREAD_SELF_TEST(&mainThread)) ||
+       (pscCount == 0) ) {
+    /* another thread will run the save calls */
+    SEMAPHORE_DOWN(cls.sig);
+  } else {
+    while (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig)) {
+      MUTEX_LOCK(&sclock);
+      if (pscCount > 0) {
+        i = randomi(pscCount);
+        if (TRUE == g_idle_remove_by_data(psc[i]))
+          saveCallWrapper(psc[i]);
+      }
+      MUTEX_UNLOCK(&sclock);
+      gnunet_util_sleep(50 * cronMILLIS);
+    }
+  }
   PTHREAD_JOIN(&doneThread,
                &unused);
   SEMAPHORE_FREE(cls.sig);