Debug: Add or adjust some traces and dumps

5 files changed, 57 insertions, 35 deletions

diff --git a/tumblerd/main.c b/tumblerd/main.c
index eaf6658..58efe81 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -284,6 +284,8 @@ main (int    argc,
       /* start the lifecycle manager */
       tumbler_lifecycle_manager_start (lifecycle_manager);
 
+      g_debug ("Ready to handle requests\n");
+
       /* enter the main loop, thereby making the tumbler service available */
       g_main_loop_run (main_loop);
     }
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index 79ceff6..e2805ee 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -330,6 +330,12 @@ tumbler_cache_service_move_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug ("Moving files in cache for moved source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "From URIs",
+                              (const gchar *const *) request->from_uris);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "To URIs",
+                              (const gchar *const *) request->to_uris);
+
       tumbler_cache_move (service->cache, 
                           (const gchar *const *)request->from_uris, 
                           (const gchar *const *)request->to_uris);
@@ -364,6 +370,12 @@ tumbler_cache_service_copy_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug ("Copying files in cache for copied source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "From URIs",
+                              (const gchar *const *) request->from_uris);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "To URIs",
+                              (const gchar *const *) request->to_uris);
+
       tumbler_cache_copy (service->cache, 
                           (const gchar *const *)request->from_uris, 
                           (const gchar *const *)request->to_uris);
@@ -397,7 +409,12 @@ tumbler_cache_service_delete_thread (gpointer data,
   tumbler_mutex_lock (service->mutex);
 
   if (service->cache != NULL)
-    tumbler_cache_delete (service->cache, (const gchar *const *)request->uris);
+    {
+      g_debug ("Removing files from cache for deleted source files");
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", (const gchar *const *) request->uris);
+
+      tumbler_cache_delete (service->cache, (const gchar *const *)request->uris);
+    }
 
   tumbler_exported_cache_service_complete_delete (request->skeleton, request->invocation);
 
@@ -427,6 +444,12 @@ tumbler_cache_service_cleanup_thread (gpointer data,
 
   if (service->cache != NULL)
     {
+      g_debug (request->since > 0 ? "Removing files older than %d from cache"
+                                  : "Removing files from cache regardless of mtime%.0d",
+               request->since);
+      tumbler_util_dump_strv (G_LOG_DOMAIN, "URI schemes",
+                              (const gchar *const *) request->base_uris);
+
       tumbler_cache_cleanup (service->cache, 
                              (const gchar *const *)request->base_uris, 
                              request->since);
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 75557ff..ef9a0e0 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -340,7 +340,11 @@ tumbler_manager_register_cb (TumblerExportedManager *skeleton,
   g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE);
   g_return_val_if_fail (uri_schemes != NULL, FALSE);
   g_return_val_if_fail (mime_types != NULL, FALSE);
-  
+
+  g_debug ("Registering new specialized thumbnailer");
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported URI schemes", uri_schemes);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "Supported mime types", mime_types);
+
   sender_name = g_dbus_method_invocation_get_sender (invocation);
 
   tumbler_mutex_lock (manager->mutex);
@@ -1827,7 +1831,10 @@ dump_overrides (TumblerManager *manager)
   if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
     return;
 
-  string = g_string_new ("Overrides:\n");
+  if (g_hash_table_size (manager->overrides) == 0)
+    return;
+
+  string = g_string_new ("Specialized thumbnailer overrides:\n");
 
   g_hash_table_iter_init (&table_iter, manager->overrides);
   while (g_hash_table_iter_next (&table_iter, (gpointer) &hash_key, (gpointer) &list))
@@ -1856,7 +1863,10 @@ dump_thumbnailers (TumblerManager *manager)
   if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
     return;
 
-  string = g_string_new ("Thumbnailers:\n");
+  if (g_hash_table_size (manager->thumbnailers) == 0)
+    return;
+
+  string = g_string_new ("Specialized thumbnailers:\n");
 
   g_hash_table_iter_init (&table_iter, manager->thumbnailers);
   while (g_hash_table_iter_next (&table_iter, (gpointer) &base_name, (gpointer) &list))
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index de48e16..7ae4f16 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -45,9 +45,6 @@ static gint                tumbler_registry_compare                   (TumblerTh
 static GList              *tumbler_registry_lookup                    (TumblerRegistry    *registry,
                                                                        const gchar        *hash_key);
 
-/* debug */
-static void                dump_registry                              (TumblerRegistry *registry);
-
 
 
 struct _TumblerRegistryClass
@@ -126,28 +123,6 @@ tumbler_registry_finalize (GObject *object)
 
 
 static void
-dump_registry (TumblerRegistry *registry)
-{
-  GString *string;
-
-  if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
-    return;
-
-  string = g_string_new ("Registry:\n");
-
-  g_string_append_printf (string, "  Preferred Thumbnailers: %d\n",
-                          g_hash_table_size (registry->preferred_thumbnailers));
-  g_string_append_printf (string, "  Registry Thumbnailers: %d\n",
-                          g_hash_table_size (registry->thumbnailers));
-
-  g_string_truncate (string, string->len - 1);
-  g_debug ("%s", string->str);
-  g_string_free (string, TRUE);
-}
-
-
-
-static void
 tumbler_registry_remove_thumbnailer (const gchar        *key,
                                      GList             **list,
                                      TumblerThumbnailer *thumbnailer)
@@ -391,8 +366,6 @@ tumbler_registry_add (TumblerRegistry    *registry,
 
   g_strfreev (hash_keys);
 
-  dump_registry (registry);
-
   tumbler_mutex_unlock (registry->mutex);
 }
 
@@ -719,7 +692,5 @@ tumbler_registry_set_preferred (TumblerRegistry    *registry,
                            g_strdup (hash_key), g_object_ref (thumbnailer));
     }
 
-  dump_registry (registry);
-
   tumbler_mutex_unlock (registry->mutex);
 }
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 27e071d..94f06b5 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -438,6 +438,10 @@ tumbler_service_scheduler_error (TumblerScheduler   *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
   
+  g_debug ("Error signal for job %d: Code %d, message: %s",
+           handle, error_code, message);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", failed_uris);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -497,7 +501,9 @@ tumbler_service_scheduler_finished (TumblerScheduler *scheduler,
   g_return_if_fail (TUMBLER_IS_SCHEDULER (scheduler));
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
-  
+
+  g_debug ("Finishing job %d\n", handle);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -555,7 +561,10 @@ tumbler_service_scheduler_ready (TumblerScheduler   *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (uris != NULL && uris[0] != NULL && *uris[0] != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
-  
+
+  g_debug ("Ready signal for job %d", handle);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", uris);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -610,6 +619,8 @@ tumbler_service_scheduler_started (TumblerScheduler *scheduler,
   g_return_if_fail (origin != NULL && *origin != '\0');
   g_return_if_fail (TUMBLER_IS_SERVICE (service));
 
+  g_debug ("Starting job %d", handle);
+
   info = g_slice_new0 (SchedulerIdleInfo);
 
   info->scheduler = g_object_ref (scheduler);
@@ -737,6 +748,9 @@ tumbler_service_queue_cb (TumblerExportedService  *skeleton,
   /* get the request handle */
   handle = scheduler_request->handle;
 
+  g_debug ("Handling request %d", handle);
+  tumbler_util_dump_strv (G_LOG_DOMAIN, "URIs", uris);
+
   /* iterate over all schedulers */
   for (iter = service->schedulers; iter != NULL; iter = iter->next)
     {
@@ -815,6 +829,8 @@ tumbler_service_dequeue_cb (TumblerExportedService  *skeleton,
 
   if (handle != 0) 
     {
+      g_debug ("Dequeuing files for job %d", handle);
+
       /* iterate over all available schedulers */
       for (iter = service->schedulers; iter != NULL; iter = iter->next)
         {