2003-01-12 Marco Pesenti Gritti <marco@it.gnome.org>

	* configure.in:
	* doc/debugging.txt:
	* embed/ephy-embed-utils.c:
	(ephy_embed_utils_build_charsets_submenu):
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_init):
	* embed/ephy-history.c: (ephy_history_save):
	* embed/mozilla/mozilla-embed.cpp:
	* lib/ephy-autocompletion.c: (ephy_autocompletion_reset),
	(ephy_autocompletion_get_common_prefix),
	(ephy_autocompletion_refine_matches),
	(ephy_autocompletion_update_matches_full),
	(ephy_autocompletion_sort_by_score),
	(ephy_autocompletion_data_changed_cb), (acma_grow):
	* lib/ephy-debug.c: (log_module), (ephy_debug_init),
	(ephy_profiler_new), (ephy_should_profile), (ephy_profiler_dump),
	(ephy_profiler_free), (ephy_profiler_start), (ephy_profiler_stop):
	* lib/ephy-debug.h:
	* lib/ephy-filesystem-autocompletion.c:
	(ephy_filesystem_autocompletion_finalize_impl),
	(gfa_load_directory_cb),
	(ephy_filesystem_autocompletion_set_current_dir),
	(ephy_filesystem_autocompletion_set_base_dir):
	* lib/ephy-start-here.c:
	* lib/widgets/ephy-autocompletion-window.c:
	(ephy_autocompletion_window_get_dimensions),
	(ephy_autocompletion_window_fill_store_chunk),
	(ephy_autocompletion_window_show),
	(ephy_autocompletion_window_key_press_cb):
	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_finalize_impl),
	(ephy_location_entry_autocompletion_show_alternatives_to),
	(ephy_location_entry_autocompletion_to),
	(ephy_location_entry_activate_cb),
	(ephy_location_entry_autocompletion_sources_changed_cb),
	(ephy_location_entry_autocompletion_window_url_activated_cb),
	(ephy_location_entry_autocompletion_window_hidden_cb):
	* src/bookmarks/ephy-bookmarks-editor.c:
	* src/bookmarks/ephy-bookmarks.c:
	(ephy_bookmarks_clean_empty_keywords), (ephy_bookmarks_save),
	(ephy_bookmarks_find_keyword), (diff_keywords):
	* src/bookmarks/ephy-keywords-entry.c: (try_to_expand_keyword):
	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_set_title):
	* src/ephy-favorites-menu.c: (ephy_favorites_menu_rebuild):
	* src/ephy-nautilus-view.c: (gnv_cmd_set_charset), (if):
	* src/ephy-navigation-button.c:
	(ephy_navigation_button_finalize_impl):
	* src/ephy-shell.c: (ephy_shell_finalize):
	* src/ephy-tab.c: (ephy_tab_embed_destroy_cb), (ephy_tab_finalize):

1 files changed, 152 insertions, 10 deletions

diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index a97c081d2..4f9f74cdd 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -20,28 +20,170 @@
 
 #include <string.h>
 
+#ifndef DISABLE_PROFILING
 
-static const char *ephy_debug_modules;
+static GHashTable *ephy_profilers_hash = NULL;
+static const char *ephy_profile_modules = NULL;
+
+#endif
+
+#ifndef DISABLE_LOGGING
+
+static const char *ephy_log_modules;
 
 static void
-log_func (const gchar *log_domain,
-	  GLogLevelFlags log_level,
-	  const gchar *message,
-	  gpointer user_data)
+log_module (const gchar *log_domain,
+	    GLogLevelFlags log_level,
+	    const gchar *message,
+	    gpointer user_data)
 {
-	if (!ephy_debug_modules) return;
+	gboolean should_log = FALSE;
+
+	if (!ephy_log_modules) return;
 
-	if ((strcmp (ephy_debug_modules, "all") == 0) ||
-	    strstr (message, ephy_debug_modules) != NULL)
+	if (strcmp (ephy_log_modules, "all") != 0)
+	{
+		char **modules;
+		int i;
+
+		modules = g_strsplit (ephy_log_modules, ":", 100);
+
+		for (i = 0; modules[i] != NULL; i++)
+		{
+			if (strstr (message, modules [i]) != NULL)
+			{
+				should_log = TRUE;
+				break;
+			}
+		}
+
+		g_strfreev (modules);
+	}
+	else
+	{
+		should_log = TRUE;
+	}
+
+	if (should_log)
 	{
 		g_print ("%s\n", message);
 	}
 }
 
+#endif
+
 void
 ephy_debug_init (void)
 {
-	ephy_debug_modules = g_getenv ("EPHY_DEBUG_MODULES");
+#ifndef DISABLE_LOGGING
+	ephy_log_modules = g_getenv ("EPHY_LOG_MODULES");
+
+	g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_module, NULL);
+#endif
+#ifndef DISABLE_PROFILING
+	ephy_profile_modules = g_getenv ("EPHY_PROFILE_MODULES");
+#endif
+}
+
+#ifndef DISABLE_PROFILING
+
+static EphyProfiler *
+ephy_profiler_new (const char *name, const char *module)
+{
+	EphyProfiler *profiler;
+
+	profiler = g_new0 (EphyProfiler, 1);
+	profiler->timer = g_timer_new ();
+	profiler->name  = g_strdup (name);
+	profiler->module  = g_strdup (module);
+
+	g_timer_start (profiler->timer);
+
+	return profiler;
+}
+
+static gboolean
+ephy_should_profile (const char *module)
+{
+	char **modules;
+	int i;
+	gboolean res = FALSE;
+
+	if (!ephy_profile_modules) return FALSE;
+	if (strcmp (ephy_profile_modules, "all") == 0) return TRUE;
+
+	modules = g_strsplit (ephy_profile_modules, ":", 100);
+
+	for (i = 0; modules[i] != NULL; i++)
+	{
+		if (strcmp (module, modules [i]) == 0)
+		{
+			res = TRUE;
+			break;
+		}
+	}
+
+	g_strfreev (modules);
 
-	g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, log_func, NULL);
+	return res;
 }
+
+static void
+ephy_profiler_dump (EphyProfiler *profiler)
+{
+	long elapsed;
+	double seconds;
+
+	g_return_if_fail (profiler != NULL);
+
+	seconds = g_timer_elapsed (profiler->timer, &elapsed);
+
+	g_print ("[ %s ] %s %ld ms (%f s) elapsed\n",
+		 profiler->module, profiler->name,
+		 elapsed / (G_USEC_PER_SEC / 1000), seconds);
+}
+
+static void
+ephy_profiler_free (EphyProfiler *profiler)
+{
+	g_return_if_fail (profiler != NULL);
+
+	g_timer_destroy (profiler->timer);
+	g_free (profiler->name);
+	g_free (profiler->module);
+	g_free (profiler);
+}
+
+void
+ephy_profiler_start (const char *name, const char *module)
+{
+	EphyProfiler *profiler;
+
+	if (ephy_profilers_hash == NULL)
+	{
+		ephy_profilers_hash =
+			g_hash_table_new_full (g_str_hash, g_str_equal,
+					       g_free, NULL);
+	}
+
+	if (!ephy_should_profile (module)) return;
+
+	profiler = ephy_profiler_new (name, module);
+
+	g_hash_table_insert (ephy_profilers_hash, g_strdup (name), profiler);
+}
+
+void
+ephy_profiler_stop (const char *name)
+{
+	EphyProfiler *profiler;
+
+	profiler = g_hash_table_lookup (ephy_profilers_hash, name);
+	if (profiler == NULL) return;
+	g_hash_table_remove (ephy_profilers_hash, name);
+
+	ephy_profiler_dump (profiler);
+	ephy_profiler_free (profiler);
+}
+
+#endif