1 files changed, 61 insertions, 0 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index b20fb8a2..e98ff375 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -115,6 +115,7 @@ change_download_colour (struct DownloadEntry *de, const char *colour)
   GtkTreeIter iter;
   GtkTreePath *path;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Changing download DE=%p color to %s\n", de, colour);
   path = gtk_tree_row_reference_get_path (de->rr);
   GNUNET_assert (NULL != path);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
@@ -135,6 +136,7 @@ change_publish_colour (struct PublishEntry *pe, const char *colour)
   GtkTreeIter iter;
   GtkTreePath *path;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Changing publish PE=%p color to %s\n", pe, colour);
   if (pe == NULL)
   {
     GNUNET_break (0);
@@ -162,6 +164,7 @@ stop_download (struct DownloadEntry *de, int is_suspend)
   GtkTreeModel *tm;
   struct SearchResult *search_result;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping download DE=%p, %s\n", de, is_suspend ? "temporarily" : "permanently");
   path = gtk_tree_row_reference_get_path (de->rr);
   tm = gtk_tree_row_reference_get_model (de->rr);
   if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
@@ -173,7 +176,10 @@ stop_download (struct DownloadEntry *de, int is_suspend)
     /*GNUNET_assert (search_result->download == de); */
     search_result->download = NULL;
     if (NULL == search_result->result)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing it from the tree\n");
       (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+    }
     else
       change_download_colour (de, "white");
   }
@@ -241,6 +247,7 @@ add_directory_entry (void *cls, const char *filename,
   GtkTreePath *path;
   GtkTreeModel *tm;
   struct GNUNET_FS_Uri *xuri;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding directory entry `%s'\n", filename);
 
   if (uri == NULL)
   {
@@ -285,6 +292,9 @@ mark_download_progress (struct DownloadEntry *de, uint64_t size,
   GtkTreeIter iter;
   GtkTreePath *path;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Marking download progress for DE=%p, %llu/%llu, %llu@%llu depth=%u\n",
+      de, completed, size, block_size, offset, depth);
   path = gtk_tree_row_reference_get_path (de->rr);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
   {
@@ -304,6 +314,7 @@ mark_download_progress (struct DownloadEntry *de, uint64_t size,
     ade.de = de;
     ade.prr = de->rr;
     ade.check_duplicates = GNUNET_NO;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "It is a directory, list its contents\n");
     if (GNUNET_SYSERR ==
         GNUNET_FS_directory_list_contents ((size_t) block_size, block_data,
                                            offset, &add_directory_entry, &ade))
@@ -323,6 +334,8 @@ mark_download_error (struct DownloadEntry *de, const char *emsg)
   GtkTreeIter iter;
   GtkTreePath *path;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Marking download error for DE=%p: %s\n", de, emsg);
   de = change_download_colour (de, "red");
   de->is_done = GNUNET_YES;
   path = gtk_tree_row_reference_get_path (de->rr);
@@ -345,6 +358,10 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size,
 {
   struct AddDirectoryEntryContext ade;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Marking download completed for DE=%p, %llu-byte `%s'\n",
+      de, size, filename);
+
   de->is_done = GNUNET_YES;
   (void) mark_download_progress (de, size, size, NULL, 0, 0, 0);
   if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
@@ -353,6 +370,7 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size,
     ade.de = de;
     ade.prr = de->rr;
     ade.check_duplicates = GNUNET_YES;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "It is a directory, scan its contents\n");
     GNUNET_FS_GTK_mmap_and_scan (filename, &add_directory_entry, &ade);
   }
   (void) change_download_colour (de, "green");
@@ -367,6 +385,9 @@ mark_publish_progress (struct PublishEntry *pe, uint64_t size,
   GtkTreeIter iter;
   GtkTreePath *path;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Marking publicaation progress for PE=%p, %llu/%llu\n",
+      pe, completed, size);
   path = gtk_tree_row_reference_get_path (pe->rr);
   if (TRUE !=
       gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts), &iter, path))
@@ -561,11 +582,15 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   GtkTreePath *path;
   struct SearchResult *srp;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Setting up download, initially DE=%p, PDE=%p for %p & %p into %llu/%llu `%s'\n",
+      de, pde, sr, dc, completed, size, filename);
   GNUNET_assert (NULL != uri);
   if (de == NULL)
   {
     de = GNUNET_malloc (sizeof (struct DownloadEntry));
     de->uri = GNUNET_FS_uri_dup (uri);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Allocated DE=%p\n", de);
   }
   de->dc = dc;
   de->sr = sr;
@@ -573,6 +598,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   {
     GNUNET_assert (sr->download == NULL);
     sr->download = de;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SR=%p now refers to DE=%p\n", sr, de);
   }
   de->pde = pde;
   if ((meta != NULL) && (de->meta == NULL))
@@ -582,6 +608,9 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     de->rr = gtk_tree_row_reference_copy (sr->rr);
     de->ts = sr->tab->ts;
     de->tab = sr->tab;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "It's started from a search result, store a copy of a reference to rr=%p (%p), ts=%p and tab=%p\n",
+        sr->rr, de->rr, de->ts, de->tab);
   }
   else if (de->rr == NULL)
   {
@@ -591,6 +620,14 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts), path);
     gtk_tree_path_free (path);
     srp->download = de;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "It's a standalone download, added it to uri tab=%p, ts=%p and rr=%p\n",
+        de->tab, de->ts, de->rr);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "It's a child download, leaving its rr, ts and tab unset\n");
   }
   path = gtk_tree_row_reference_get_path (de->rr);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
@@ -633,6 +670,9 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   char cwd[FILENAME_MAX];
   char *filename;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Starting a %sdownload\n", recursive ? "recursive " : "");
+
   GNUNET_assert (tab != NULL);
   tm = gtk_tree_view_get_model (tree_view);
   if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
@@ -773,6 +813,9 @@ abort_download_ctx_menu (gpointer user_data, guint unused, GtkWidget * widget)
 {
   struct DownloadEntry *de = user_data;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Aborting a download DE=%p\n", de);
+
   GNUNET_assert (de->dc != NULL);
   GNUNET_FS_download_stop (de->dc, GNUNET_YES);
   current_context_search_tab = NULL;
@@ -886,6 +929,8 @@ search_list_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
        * => need to know download status before creating menu!
        */
       menu = GTK_MENU (gtk_menu_new ());
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+          "Creating a menu for SR=%p, DE=%p\n", sr, sr->download);
       if (sr->download == NULL)
       {
         child = gtk_menu_item_new_with_label (_("_Download"));
@@ -1197,7 +1242,12 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
   GtkWindow *sf;
   gint pages;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Setting up a search for %p\n", sc);
+
   tab = GNUNET_malloc (sizeof (struct SearchTab));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Allocated a tab %p\n", tab);
   GNUNET_CONTAINER_DLL_insert (search_tab_head, search_tab_tail, tab);
   tab->sc = sc;
   if (query == NULL)
@@ -1411,6 +1461,8 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
   sr = GNUNET_malloc (sizeof (struct SearchResult));
   sr->result = result;
   sr->tab = tab;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Allocated a search result SR=%p\n", sr);
   if (parent_rr != NULL)
   {
     /* get piter from parent */
@@ -1564,6 +1616,10 @@ update_search_result (struct SearchResult *sr,
   GtkNotebook *notebook;
   gint page;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Updating search result SR=%p with %d, %u, %u\n",
+      sr, availability_rank, availability_certainty, applicability_rank);
+
   if (sr == NULL)
     return NULL;
   desc =
@@ -1599,6 +1655,8 @@ update_search_result (struct SearchResult *sr,
                                                      EXTRACTOR_METATYPE_MIMETYPE,
                                                      EXTRACTOR_METATYPE_FORMAT,
                                                      -1);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "mime=`%s', desc=`%s'\n", mime, desc);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   tp = gtk_tree_row_reference_get_path (sr->rr);
   tm = gtk_tree_row_reference_get_model (sr->rr);
@@ -1650,6 +1708,9 @@ free_search_result (struct SearchResult *sr)
   struct GNUNET_FS_Uri *uri;
   struct GNUNET_CONTAINER_MetaData *meta;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Freeing a search result SR=%p\n", sr);
+
   if (sr == NULL)
   {
     GNUNET_break (0);