X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fmain.c;h=4e306c6d4ef97d288952540e54a3cdf83fadfc83;hb=8743690d339401db862834d50f9b6bbd1268271f;hp=a27519e8fe2c1791a912bc43742fe7bad34a8630;hpb=9bbfbc9543b6bc9abd8cde0a2161cf15250455fc;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/main.c b/ltt/branches/poly/lttv/lttv/main.c
index a27519e8..4e306c6d 100644
--- a/ltt/branches/poly/lttv/lttv/main.c
+++ b/ltt/branches/poly/lttv/lttv/main.c
@@ -16,6 +16,9 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <lttv/hook.h>
 #include <lttv/module.h>
@@ -26,6 +29,7 @@
 #include <lttv/traceset.h>
 #include <ltt/trace.h>
 #include <stdio.h>
+#include <string.h>
 
 
 /* The main program maintains a few central data structures and relies
@@ -46,7 +50,8 @@ static char
 
 static gboolean
   a_verbose,
-  a_debug;
+  a_debug,
+  a_fatal;
 
 gboolean lttv_profile_memory;
 
@@ -62,20 +67,24 @@ static void lttv_verbose(void *hook_data);
 
 static void lttv_debug(void *hook_data);
 
+static void lttv_fatal(void *hook_data);
+
 static void lttv_help(void *hook_data);
 
 /* This is the handler to specify when we dont need all the debugging 
    messages. It receives the message and does nothing. */
 
 void ignore_and_drop_message(const gchar *log_domain, GLogLevelFlags log_level,
-    const gchar *message, gpointer user_data) {
+    const gchar *message, gpointer user_data)
+{
 }
 
 
 /* Since everything is done in modules, the main program only takes care
    of the infrastructure. */
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
 
   int i;
 
@@ -144,9 +153,9 @@ int main(int argc, char **argv) {
   GError *error = NULL;
 
   LttvModule *module_module = lttv_module_require("module", &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
   LttvModule *module_option = lttv_module_require("option", &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
 
   /* Initialize the module loading */
 
@@ -173,6 +182,11 @@ int main(int argc, char **argv) {
   a_debug = FALSE;
   lttv_option_add("debug",'d', "print debugging messages", "none", 
       LTTV_OPT_NONE, NULL, lttv_debug, NULL);
+
+  a_fatal = FALSE;
+  lttv_option_add("fatal",'f', "make critical messages fatal",
+                  "none", 
+      LTTV_OPT_NONE, NULL, lttv_fatal, NULL);
  
   lttv_profile_memory = FALSE;
   lttv_option_add(profile_memory_long_option + 2, 
@@ -225,11 +239,11 @@ LttvAttribute *lttv_global_attributes()
 
 
 void lttv_module_option(void *hook_data)
-{ 
+{
   GError *error = NULL;
 
   lttv_module_require(a_module, &error);
-  if(error != NULL) g_error(error->message);
+  if(error != NULL) g_error("%s", error->message);
 }
 
 
@@ -251,12 +265,19 @@ void lttv_debug(void *hook_data)
   g_info("Logging set to include DEBUG level messages");
 }
 
+void lttv_fatal(void *hook_data)
+{
+  g_log_set_always_fatal(G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
+  //g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+  g_info("Critical log from glib will abort execution");
+}
+
 void lttv_help(void *hook_data)
 {
-	printf("Linux Trace Toolkit Visualizer\n");
-	printf("\n");
-	lttv_option_show_help();
-	printf("\n");
+  printf("Linux Trace Toolkit Visualizer " VERSION "\n");
+  printf("\n");
+  lttv_option_show_help();
+  printf("\n");
 }
 
 /*