X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmain.c;h=de3c77096bf4dea8810692da3e1ce293371b235d;hb=7d5ffafa764fe5d44a0bf6873894011877d728d2;hp=a1bfcd087726a8f6349d3f4240fea13b0ac3ea7a;hpb=41f18f3ef43db3c0f71b5bf232d27f7004673aef;p=lttv.git

diff --git a/ltt/branches/poly/lttv/main.c b/ltt/branches/poly/lttv/main.c
index a1bfcd08..de3c7709 100644
--- a/ltt/branches/poly/lttv/main.c
+++ b/ltt/branches/poly/lttv/main.c
@@ -7,6 +7,8 @@
 #include <lttv/option.h>
 #include <lttv/traceset.h>
 #include <ltt/trace.h>
+#include <stdio.h>
+
 
 void lttv_option_init(int argc, char **argv);
 void lttv_option_destroy();
@@ -17,6 +19,9 @@ void lttv_module_destroy();
 void lttv_state_init(int argc, char **argv);
 void lttv_state_destroy();
 
+void lttv_stats_init(int argc, char **argv);
+void lttv_stats_destroy();
+
 /* The main program maintains a few central data structures and relies
    on modules for the rest. These data structures may be accessed by modules
    through an exported API */
@@ -33,6 +38,10 @@ static char
   *a_module,
   *a_module_path;
 
+static gboolean
+  a_verbose,
+  a_debug;
+
 static int a_argc;
 
 static char **a_argv;
@@ -41,6 +50,11 @@ static void lttv_module_option(void *hook_data);
 
 static void lttv_module_path_option(void *hook_data);
 
+static void lttv_verbose(void *hook_data);
+
+static void lttv_debug(void *hook_data);
+
+static void lttv_help(void);
 
 /* Since everything is done in modules, the main program only takes care
    of the infrastructure. */
@@ -81,9 +95,12 @@ int main(int argc, char **argv) {
 
   /* Initialize the command line options processing */
 
+  a_argc = argc;
+  a_argv = argv;
   lttv_option_init(argc,argv);
   lttv_module_init(argc,argv);
   lttv_state_init(argc,argv);
+  lttv_stats_init(argc,argv);
 
   /* Initialize the module loading */
 
@@ -98,7 +115,19 @@ int main(int argc, char **argv) {
       "add a directory to the module search path", 
       "directory to add to the path", LTTV_OPT_STRING, &a_module_path, 
       lttv_module_path_option, NULL);
+	
+  lttv_option_add("help",'h', "basic help", "none", 
+      LTTV_OPT_NONE, NULL, lttv_help, NULL);
 
+  a_verbose = FALSE; 
+  lttv_option_add("verbose",'v', "print information messages", "none", 
+      LTTV_OPT_NONE, NULL, lttv_verbose, NULL);
+ 
+  a_debug = FALSE;
+  lttv_option_add("debug",'d', "print debugging messages", "none", 
+      LTTV_OPT_NONE, NULL, lttv_debug, NULL);
+ 
+ 
   lttv_hooks_call(before_options, NULL);
   lttv_option_parse(argc, argv);
   lttv_hooks_call(after_options, NULL);
@@ -106,6 +135,7 @@ int main(int argc, char **argv) {
   lttv_hooks_call(before_main, NULL);
   lttv_hooks_call(after_main, NULL);
 
+  lttv_stats_destroy();
   lttv_state_destroy();
   lttv_module_destroy();
   lttv_option_destroy();
@@ -139,3 +169,29 @@ void lttv_module_path_option(void *hook_data)
 {
   lttv_module_path_add(a_module_path);
 }
+
+void lttv_verbose(void *hook_data)
+{
+  g_log_set_handler(NULL, G_LOG_LEVEL_INFO, g_log_default_handler, NULL);
+  g_info("Logging set to include INFO level messages");
+}
+
+void lttv_debug(void *hook_data)
+{
+  g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, g_log_default_handler, NULL);
+  g_info("Logging set to include DEBUG level messages");
+}
+
+void lttv_help()
+{
+	printf("Linux Trace Toolkit Visualizer\n");
+	printf("\n");
+	lttv_option_show_help();
+	printf("\n");
+}
+
+/* remove countEvents.c, add alias to init to allow static/dynamic loading 
+   MODULE_INFO(name, init, destroy, { require} ). This info could be used
+   by module_load and as a constructor function when not a module
+   -> check constructor functions versus dynamic loading and init section
+   -> have a list of available modules builtin as default or mandatory */