Merge lp:~alexlauni/unity/logging-enhancements into lp:unity

[Alex Launi]

Adds -DBOOT_LOGGER=ON to Cmake flags to enable unity boot time logging. Also makes boot logging a noop when BOOT_LOGGER is off.

[Jason Smith (jassmith)]

+1 looks good

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-12-09 18:02:17 +0000
+++ CMakeLists.txt	2010-12-16 15:49:11 +0000
@@ -72,6 +72,14 @@
 endif (${GETTEXT_FOUND} STREQUAL "TRUE")
 
 #
+# Enable or disable boot logging
+# 
+option (BOOT_LOGGER "Enable startup performance logging" OFF)
+if (BOOT_LOGGER)
+    SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
+endif (BOOT_LOGGER)
+
+#
 # src (Compiz Plugin)
 #
 set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dbus-glib-1;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib;x11;libstartup-notification-1.0;gthread-2.0;indicator")
@@ -81,10 +89,10 @@
 compiz_plugin (unityshell
                PKGDEPS ${UNITY_PLUGIN_DEPS}
                PLUGINDEPS composite opengl
-               CFLAGSADD "-DINSTALLPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DPKGDATADIR='\"${CMAKE_INSTALL_PREFIX}/share/unity/3\"' -I${CMAKE_BINARY_DIR}"
+               CFLAGSADD "-DINSTALLPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DPKGDATADIR='\"${CMAKE_INSTALL_PREFIX}/share/unity/3\"' -I${CMAKE_BINARY_DIR} ${BOOT_LOGGER_FLAG}"
                LIBRARIES "unity"
                )
-
+               
 #
 # GSettings Schema
 #

=== modified file 'libunity/perf-logger-utility.h'
--- libunity/perf-logger-utility.h	2010-12-02 12:18:22 +0000
+++ libunity/perf-logger-utility.h	2010-12-16 15:49:11 +0000
@@ -21,14 +21,23 @@
 
 #include <libunity/unity.h>
 
-#define START_FUNCTION() G_STMT_START { \
-                          perf_timeline_logger_start_process (perf_timeline_logger_get_default(), G_STRFUNC);\
-                       } G_STMT_END
-#define LOGGER_START_PROCESS(process) { perf_timeline_logger_start_process (perf_timeline_logger_get_default(), process);}
+#ifdef ENABLE_LOGGER
+  #define START_FUNCTION() G_STMT_START { \
+                            perf_timeline_logger_start_process (perf_timeline_logger_get_default(), G_STRFUNC);\
+                         } G_STMT_END
+  #define LOGGER_START_PROCESS(process) { perf_timeline_logger_start_process (perf_timeline_logger_get_default(), process);}
 
-#define END_FUNCTION() G_STMT_START { \
-                          perf_timeline_logger_end_process (perf_timeline_logger_get_default(), G_STRFUNC);\
-                       } G_STMT_END
-#define LOGGER_END_PROCESS(process) { perf_timeline_logger_end_process (perf_timeline_logger_get_default(), process);}
+  #define END_FUNCTION() G_STMT_START { \
+                            perf_timeline_logger_end_process (perf_timeline_logger_get_default(), G_STRFUNC);\
+                         } G_STMT_END
+  #define LOGGER_END_PROCESS(process) { perf_timeline_logger_end_process (perf_timeline_logger_get_default(), process);}
+  #define LOGGER_WRITE_LOG(file) { perf_timeline_logger_write_log (perf_timeline_logger_get_default(), file);}
+#else
+  #define START_FUNCTION()
+  #define LOGGER_START_PROCESS(process)
+  #define END_FUNCTION()
+  #define LOGGER_END_PROCESS(process)
+  #define LOGGER_WRITE_LOG(file)
+#endif /* ENABLE_LOGGER */
 
 #endif /* PERF_LOGGER_H */

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-12-16 09:13:58 +0000
+++ src/unity.cpp	2010-12-16 15:49:11 +0000
@@ -368,7 +368,7 @@
 static gboolean
 write_logger_data_to_disk (gpointer data)
 {
-  perf_timeline_logger_write_log (perf_timeline_logger_get_default (), "/tmp/unity-perf.log");
+  LOGGER_WRITE_LOG ("/tmp/unity-perf.log");
   return FALSE;
 }
 
@@ -415,6 +415,7 @@
   optionSetLauncherFloatNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
 
   g_timeout_add (0, &UnityScreen::initPluginActions, this);
+  g_timeout_add (5000, (GSourceFunc) write_logger_data_to_disk, NULL);
   END_FUNCTION ();
   g_timeout_add (5000, write_logger_data_to_disk, NULL);
 }