gnome-settings-daemon r576 - in trunk: . gnome-settings-daemon plugins/font plugins/keyboard plugins/xrandr plugins/xsettings

[behdad svn gnome org]

Author: behdad
Date: Mon Nov  3 21:16:44 2008
New Revision: 576
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=576&view=rev

Log:
2008-11-03  Behdad Esfahbod  <behdad gnome org>

        * gnome-settings-daemon/gnome-settings-manager.c (_load_file):
        * gnome-settings-daemon/gnome-settings-plugin-info.c
        (gnome_settings_plugin_info_fill_from_file), (load_plugin_module):
        * plugins/font/gsd-font-manager.c (child_watch_cb),
        (spawn_with_input):
        * plugins/keyboard/gsd-keyboard-xkb.c (gsd_keyboard_xkb_init):
        * plugins/xrandr/gsd-xrandr-manager.c (gsd_xrandr_manager_start):
        * plugins/xsettings/gsd-xsettings-manager.c (child_watch_cb),
        (spawn_with_input), (start_fontconfig_monitor),
        (stop_fontconfig_monitor), (gnome_xsettings_manager_start),
        (gnome_xsettings_manager_stop):
        Improve performance logging annotations (bug #559162)

Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/gnome-settings-manager.c
   trunk/gnome-settings-daemon/gnome-settings-plugin-info.c
   trunk/plugins/font/gsd-font-manager.c
   trunk/plugins/keyboard/gsd-keyboard-xkb.c
   trunk/plugins/xrandr/gsd-xrandr-manager.c
   trunk/plugins/xsettings/gsd-xsettings-manager.c

Modified: trunk/gnome-settings-daemon/gnome-settings-manager.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-manager.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-manager.c	Mon Nov  3 21:16:44 2008
@@ -163,18 +163,16 @@
         GSList                  *l;
 
         g_debug ("Loading plugin: %s", filename);
-        gnome_settings_profile_start (NULL);
+        gnome_settings_profile_start ("%s", filename);
 
         info = gnome_settings_plugin_info_new_from_file (filename);
         if (info == NULL) {
                 goto out;
         }
 
-        gnome_settings_profile_start ("seeing if already loaded");
         l = g_slist_find_custom (manager->priv->plugins,
                                  info,
                                  (GCompareFunc) compare_location);
-        gnome_settings_profile_end ("seeing if already loaded");
         if (l != NULL) {
                 goto out;
         }
@@ -187,15 +185,12 @@
         g_signal_connect (info, "deactivated",
                           G_CALLBACK (on_plugin_deactivated), manager);
 
-        gnome_settings_profile_start ("setting active property");
         key_name = g_strdup_printf ("%s/%s/active",
                                     manager->priv->settings_prefix,
                                     gnome_settings_plugin_info_get_location (info));
         gnome_settings_plugin_info_set_enabled_key_name (info, key_name);
         g_free (key_name);
-        gnome_settings_profile_end ("setting active property");
 
-        gnome_settings_profile_start ("setting priority property");
         key_name = g_strdup_printf ("%s/%s/priority",
                                     manager->priv->settings_prefix,
                                     gnome_settings_plugin_info_get_location (info));
@@ -211,14 +206,13 @@
         }
         g_free (key_name);
         g_object_unref (client);
-        gnome_settings_profile_end ("setting priority property");
 
  out:
         if (info != NULL) {
                 g_object_unref (info);
         }
 
-        gnome_settings_profile_end (NULL);
+        gnome_settings_profile_end ("%s", filename);
 }
 
 static void

Modified: trunk/gnome-settings-daemon/gnome-settings-plugin-info.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-plugin-info.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-plugin-info.c	Mon Nov  3 21:16:44 2008
@@ -185,7 +185,7 @@
         int       priority;
         gboolean  ret;
 
-        gnome_settings_profile_start (NULL);
+        gnome_settings_profile_start ("%s", filename);
 
         ret = FALSE;
 
@@ -290,7 +290,7 @@
 
         ret = TRUE;
  out:
-        gnome_settings_profile_end (NULL);
+        gnome_settings_profile_end ("%s", filename);
 
         return ret;
 }
@@ -388,7 +388,7 @@
         g_return_val_if_fail (info->priv->plugin == NULL, FALSE);
         g_return_val_if_fail (info->priv->available, FALSE);
 
-        gnome_settings_profile_start (NULL);
+        gnome_settings_profile_start ("%s", info->priv->location);
 
         switch (info->priv->loader) {
                 case GNOME_SETTINGS_PLUGIN_LOADER_C:
@@ -484,7 +484,7 @@
         g_type_module_unuse (info->priv->module);
         ret = TRUE;
  out:
-        gnome_settings_profile_end (NULL);
+        gnome_settings_profile_end ("%s", info->priv->location);
         return ret;
 }
 

Modified: trunk/plugins/font/gsd-font-manager.c
==============================================================================
--- trunk/plugins/font/gsd-font-manager.c	(original)
+++ trunk/plugins/font/gsd-font-manager.c	Mon Nov  3 21:16:44 2008
@@ -78,6 +78,7 @@
 {
         char *command = user_data;
 
+        gnome_settings_profile_end ("%s", command);
         if (!WIFEXITED (status) || WEXITSTATUS (status)) {
                 g_warning ("Command %s failed", command);
         }
@@ -100,6 +101,7 @@
                 return;
         }
 
+        gnome_settings_profile_start ("%s", command);
         error = NULL;
         res = g_spawn_async_with_pipes (NULL,
                                         argv,

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.c	Mon Nov  3 21:16:44 2008
@@ -345,6 +345,7 @@
 void
 gsd_keyboard_xkb_init (GConfClient *client)
 {
+        gnome_settings_profile_start (NULL);
 #ifdef GSDKX
         xkl_set_debug_level (200);
         logfile = fopen ("/tmp/gsdkx.log", "a");
@@ -386,6 +387,7 @@
                 apply_settings ();
                 apply_xkb_settings ();
         }
+        gnome_settings_profile_end (NULL);
 }
 
 void

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Mon Nov  3 21:16:44 2008
@@ -692,6 +692,7 @@
                           GError          **error)
 {
         g_debug ("Starting xrandr manager");
+        gnome_settings_profile_start (NULL);
 
         manager->priv->rw_screen = gnome_rr_screen_new (
                 gdk_screen_get_default (), on_randr_event, manager);
@@ -745,6 +746,8 @@
 
         start_or_stop_icon (manager);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/xsettings/gsd-xsettings-manager.c
==============================================================================
--- trunk/plugins/xsettings/gsd-xsettings-manager.c	(original)
+++ trunk/plugins/xsettings/gsd-xsettings-manager.c	Mon Nov  3 21:16:44 2008
@@ -425,6 +425,7 @@
 {
         char *command = user_data;
 
+        gnome_settings_profile_end ("%s", command);
         if (!WIFEXITED (status) || WEXITSTATUS (status)) {
                 g_warning ("Command %s failed", command);
         }
@@ -447,6 +448,7 @@
                 return;
         }
 
+        gnome_settings_profile_start ("%s", command);
         error = NULL;
         res = g_spawn_async_with_pipes (NULL,
                                         argv,
@@ -564,6 +566,22 @@
         gnome_settings_profile_end (NULL);
 }
 
+static void
+start_fontconfig_monitor (GnomeXSettingsManager  *manager)
+{
+        gnome_settings_profile_start (NULL);
+
+        manager->priv->fontconfig_handle = fontconfig_monitor_start ((GFunc) fontconfig_callback, manager);
+
+        gnome_settings_profile_end (NULL);
+}
+
+static void
+stop_fontconfig_monitor (GnomeXSettingsManager  *manager)
+{
+        fontconfig_monitor_stop (manager->priv->fontconfig_handle);
+        manager->priv->fontconfig_handle = NULL;
+}
 #endif /* HAVE_FONTCONFIG */
 
 static const char *
@@ -877,7 +895,7 @@
                                           (GConfClientNotifyFunc) xft_callback);
         update_xft_settings (manager, client);
 
-        manager->priv->fontconfig_handle = fontconfig_monitor_start ((GFunc) fontconfig_callback, manager);
+        start_fontconfig_monitor (manager);
 #endif /* HAVE_FONTCONFIG */
 
         g_object_unref (client);
@@ -924,8 +942,7 @@
 #ifdef HAVE_FONTCONFIG
         gconf_client_remove_dir (client, FONT_RENDER_DIR, NULL);
 
-        fontconfig_monitor_stop (manager->priv->fontconfig_handle);
-        manager->priv->fontconfig_handle = NULL;
+        stop_fontconfig_monitor (manager);
 #endif /* HAVE_FONTCONFIG */
 
         for (i = 0; i < G_N_ELEMENTS (p->notify); ++i) {