fixing deadlock, more remaining

4 files changed, 42 insertions, 12 deletions

diff --git a/TODO b/TODO
index c6013310..06910c4a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 0.7.1:
+- deadlock: FSUI_startDownload/Upload
+  must NOT be done in main thread [pre2]
 - fix addition of previews for uploads [pre2]
 - create directory from known file IDs [ medium ] [pre2]
   in Assemble Directory's Files Available/Selected
@@ -14,9 +16,6 @@
   + collection abortion
 
 ODD BUGS TO WATCH OUT FOR (seen, possibly fixed, hard to reproduce):
-- deadlock (download directory, download files in
-  directory, clear (multiple) completed downloads
-  => strange deadlock)
 - Assertion failed at download.c:264 in fs_download_started.
 
 0.7.2:
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index e5e16ab0..eab6ed20 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -99,7 +99,10 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
   unsigned long long size;
   char * data;
   int fd;
+  char * fn;
   struct ECRS_MetaData * meta;
+  struct stat buf;
+  const char * f;
 
   if ( (list->is_directory != YES) ||
        (list->searchList == NULL) ||
@@ -107,18 +110,37 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
        (! gtk_tree_row_reference_valid(list->searchViewRowReference)) )
     return;
 
-  if (OK != disk_file_size(ectx,
-                           list->filename,
-                           &size,
-                           YES))
+  if (0 != stat(list->filename,
+                &buf)) 
     return;
-  if (size == 0)
+  if (S_ISDIR(buf.st_mode)) {
+    fn = MALLOC(strlen(list->filename) + strlen(GNUNET_DIRECTORY_EXT) + 1);
+    strcpy(fn, list->filename);
+    if (fn[strlen(fn)-1] == '/') 
+      fn[strlen(fn)-1] = '\0';
+    strcat(fn, GNUNET_DIRECTORY_EXT);   
+    if (0 != stat(list->filename,
+                  &buf)) {
+      FREE(fn);
+      return;
+    }
+    f = fn;
+  } else {
+    fn = NULL;
+    f = list->filename;
+  }
+  size = buf.st_size;
+  if (size == 0) {
+    FREENONNULL(fn);
     return;
+  }
   fd = disk_file_open(ectx,
                       list->filename,
                       O_RDONLY);
-  if (fd == -1)
+  if (fd == -1) {
+    FREENONNULL(fn);
     return;
+  }
   data = MMAP(NULL,
               size,
               PROT_READ,
@@ -130,10 +152,12 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
     GE_LOG_STRERROR_FILE(ectx,
                          GE_ERROR | GE_ADMIN | GE_BULK,
                          "mmap",
-                         list->filename);
+                         f);
     CLOSE(fd);
+    FREENONNULL(fn);
     return;
   }
+  FREENONNULL(fn);
   meta = NULL;
   ECRS_listDirectory(ectx,
                      data,
@@ -613,6 +637,7 @@ initiateDownload(GtkTreeModel * model,
                           NULL)) {
     addLogEntry(_("Downloading `%s'"),
                 idc_name);
+    /* FIXME! DEADLOCK! */
     FSUI_startDownload(ctx,
                        getSpinButtonValue(searchContext->searchXML,
                                           "downloadAnonymitySpinButton"),
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 8b2b5302..d8521179 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -636,6 +636,7 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
     }
     list = list->next;
   }
+  /* FIXME: deadlock! */
   FSUI_startSearch(ctx,
                    getSpinButtonValue(getMainXML(),
                                       "searchAnonymitySelectionSpinButton"),    
@@ -696,6 +697,7 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
 void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
+  struct FCBC fcbc;
 
   list = search_head;
   while (list != NULL) {
@@ -704,8 +706,11 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  FSUI_abortSearch(ctx,
-                   list->fsui_list);
+
+  fcbc.method = &FSUI_abortSearch;
+  fcbc.argument = list->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 static void stopSearch(GtkTreeModel * model,
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 9d3fea8d..aa800b34 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -405,6 +405,7 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
     gkeywordURI = ECRS_stringToUri(ectx,
                                    ECRS_URI_PREFIX
                                    ECRS_SEARCH_INFIX);
+    /* FIXME: DEADLOCK! */
     FSUI_startUpload(ctx,
                      filename,
                      (DirectoryScanCallback) &disk_directory_scan,