From 8f439a5ae5c46ce5e3868078735253ca9d03aca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= Date: Fri, 24 Dec 2021 23:40:38 +0100 Subject: Debug: Prefer runtime to compile-time check for logging This is more convenient for both the developer and the user, especially when it comes to providing logs in a bug report. As for the loss in terms of performance, it is minimal, and this is normally not an issue where these functions are used. --- tumblerd/tumbler-manager.c | 90 +++++++++++++++++++-------------------------- tumblerd/tumbler-registry.c | 12 +++--- 2 files changed, 43 insertions(+), 59 deletions(-) (limited to 'tumblerd') diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c index b2302a9..6f6c310 100644 --- a/tumblerd/tumbler-manager.c +++ b/tumblerd/tumbler-manager.c @@ -92,10 +92,9 @@ static ThumbnailerInfo *thumbnailer_info_new (void); static void thumbnailer_info_free (ThumbnailerInfo *info); static void thumbnailer_info_list_free (gpointer pointer); -#ifdef DEBUG +/* debug */ static void dump_overrides (TumblerManager *manager); static void dump_thumbnailers (TumblerManager *manager); -#endif @@ -146,10 +145,10 @@ struct _OverrideInfo struct _ThumbnailerInfo { TumblerThumbnailer *thumbnailer; -#ifdef DEBUG - GFile *file; -#endif gint dir_index; + + /* debug */ + GFile *file; }; @@ -779,9 +778,7 @@ tumbler_manager_load_overrides (TumblerManager *manager) g_object_unref (file); } -#ifdef DEBUG dump_overrides (manager); -#endif } @@ -1018,9 +1015,8 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager, /* allocate a new thumbnailer info */ info = thumbnailer_info_new (); -#ifdef DEBUG - info->file = g_object_ref (file); -#endif + if (tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) + info->file = g_object_ref (file); /* compute the directory index of the input file */ directory = g_file_get_parent (file); @@ -1283,9 +1279,7 @@ tumbler_manager_load (TumblerManager *manager) for (iter = manager->directories; iter != NULL; iter = iter->next) tumbler_manager_load_thumbnailers (manager, iter->data); -#ifdef DEBUG dump_thumbnailers (manager); -#endif /* update the overrides cache */ tumbler_manager_load_overrides (manager); @@ -1611,39 +1605,31 @@ tumbler_manager_directory_changed (TumblerManager *manager, if (event_type == G_FILE_MONITOR_EVENT_DELETED) { - base_name = g_file_get_basename (file); + g_debug (" %s deleted", g_file_peek_path (file)); + base_name = g_file_get_basename (file); if (g_strcmp0 (base_name, "overrides") == 0) { -#ifdef DEBUG - g_debug (" %s deleted", g_file_peek_path (file)); -#endif tumbler_mutex_lock (manager->mutex); tumbler_manager_unload_overrides_file (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_overrides (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } else if (g_str_has_suffix (base_name, ".service")) { -#ifdef DEBUG - g_debug (" %s deleted", g_file_peek_path (file)); -#endif tumbler_mutex_lock (manager->mutex); tumbler_manager_thumbnailer_file_deleted (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_thumbnailers (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } else { -#ifdef DEBUG - g_debug (" %s deleted", g_file_peek_path (file)); -#endif tumbler_mutex_lock (manager->mutex); dir_index = tumbler_manager_get_dir_index (manager, file); tumbler_mutex_unlock (manager->mutex); @@ -1653,10 +1639,10 @@ tumbler_manager_directory_changed (TumblerManager *manager, tumbler_mutex_lock (manager->mutex); tumbler_manager_directory_deleted (manager, file, dir_index); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_overrides (manager); dump_thumbnailers (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } } @@ -1673,29 +1659,27 @@ tumbler_manager_directory_changed (TumblerManager *manager, { if (event_type == G_FILE_MONITOR_EVENT_CREATED) { -#ifdef DEBUG g_debug (" %s created", g_file_peek_path (file)); -#endif + tumbler_mutex_lock (manager->mutex); tumbler_manager_load_overrides_file (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_overrides (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } else if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) { -#ifdef DEBUG g_debug (" %s changed", g_file_peek_path (file)); -#endif + tumbler_mutex_lock (manager->mutex); tumbler_manager_unload_overrides_file (manager, file); tumbler_manager_load_overrides_file (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_overrides (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } } @@ -1703,29 +1687,27 @@ tumbler_manager_directory_changed (TumblerManager *manager, { if (event_type == G_FILE_MONITOR_EVENT_CREATED) { -#ifdef DEBUG g_debug (" %s created", g_file_peek_path (file)); -#endif + tumbler_mutex_lock (manager->mutex); tumbler_manager_load_thumbnailer (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_thumbnailers (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } else if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) { -#ifdef DEBUG g_debug (" %s changed", g_file_peek_path (file)); -#endif + tumbler_mutex_lock (manager->mutex); tumbler_manager_thumbnailer_file_deleted (manager, file); tumbler_manager_load_thumbnailer (manager, file); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_thumbnailers (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } } @@ -1738,17 +1720,15 @@ tumbler_manager_directory_changed (TumblerManager *manager, if (dir_index >= 0) { -#ifdef DEBUG g_debug (" %s created", g_file_peek_path (file)); -#endif tumbler_mutex_lock (manager->mutex); tumbler_manager_directory_created (manager, file, dir_index); tumbler_registry_update_supported (manager->registry); -#ifdef DEBUG + dump_overrides (manager); dump_thumbnailers (manager); -#endif + tumbler_mutex_unlock (manager->mutex); } } @@ -1811,9 +1791,9 @@ thumbnailer_info_free (ThumbnailerInfo *info) if (info == NULL) return; -#ifdef DEBUG - g_object_unref (info->file); -#endif + if (tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) + g_object_unref (info->file); + g_object_unref (info->thumbnailer); g_slice_free (ThumbnailerInfo, info); } @@ -1835,7 +1815,6 @@ thumbnailer_info_list_free (gpointer pointer) -#ifdef DEBUG static void dump_overrides (TumblerManager *manager) { @@ -1844,6 +1823,9 @@ dump_overrides (TumblerManager *manager) GList **list; GList *iter; + if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) + return; + g_print ("Overrides:\n"); g_hash_table_iter_init (&table_iter, manager->overrides); @@ -1867,6 +1849,9 @@ dump_thumbnailers (TumblerManager *manager) GList **list; GList *iter; + if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) + return; + g_print ("Thumbnailers:\n"); g_hash_table_iter_init (&table_iter, manager->thumbnailers); @@ -1879,7 +1864,6 @@ dump_thumbnailers (TumblerManager *manager) g_print ("\n"); } -#endif /* DEBUG */ diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index d605190..6f5ad16 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -45,6 +45,9 @@ 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 @@ -122,17 +125,18 @@ tumbler_registry_finalize (GObject *object) -#ifdef DEBUG static void dump_registry (TumblerRegistry *registry) { + if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN)) + return; + g_print ("Registry:\n"); g_print (" Preferred Thumbnailers: %d\n", g_hash_table_size (registry->preferred_thumbnailers)); g_print (" Registry Thumbnailers: %d\n",g_hash_table_size (registry->thumbnailers)); g_print ("\n"); } -#endif @@ -380,9 +384,7 @@ tumbler_registry_add (TumblerRegistry *registry, g_strfreev (hash_keys); -#ifdef DEBUG dump_registry (registry); -#endif tumbler_mutex_unlock (registry->mutex); } @@ -710,9 +712,7 @@ tumbler_registry_set_preferred (TumblerRegistry *registry, g_strdup (hash_key), g_object_ref (thumbnailer)); } -#ifdef DEBUG dump_registry (registry); -#endif tumbler_mutex_unlock (registry->mutex); } -- cgit v1.2.1