X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmain.c;h=de3c77096bf4dea8810692da3e1ce293371b235d;hb=cf6cb7e0d0462bba8b38d00adc593c0107b79f37;hp=b588e42910e3db6df84f8b2ded10215f11297970;hpb=dc87756342c051418eccb2b7d932ffa5453c6788;p=lttv.git

diff --git a/ltt/branches/poly/lttv/main.c b/ltt/branches/poly/lttv/main.c
index b588e429..de3c7709 100644
--- a/ltt/branches/poly/lttv/main.c
+++ b/ltt/branches/poly/lttv/main.c
@@ -2,10 +2,13 @@
 #include <lttv/hook.h>
 #include <lttv/module.h>
 #include <lttv/lttv.h>
+#include <lttv/iattribute.h>
 #include <lttv/attribute.h>
 #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();
@@ -13,11 +16,17 @@ void lttv_option_destroy();
 void lttv_module_init(int argc, char **argv);
 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 */
 
-static LttvIAttributes *attributes;
+static LttvIAttribute *attributes;
 
 static LttvHooks
   *before_options,
@@ -29,6 +38,10 @@ static char
   *a_module,
   *a_module_path;
 
+static gboolean
+  a_verbose,
+  a_debug;
+
 static int a_argc;
 
 static char **a_argv;
@@ -37,17 +50,18 @@ static void lttv_module_option(void *hook_data);
 
 static void lttv_module_path_option(void *hook_data);
 
-#ifdef MEMDEBUG
-extern struct GMemVTable *glib_mem_profiler_table;
-#endif
+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. */
 
 int main(int argc, char **argv) {
 
-  LttvAttributeValue *value;
+  LttvAttributeValue value;
 
 #ifdef MEMDEBUG
   g_mem_set_vtable(glib_mem_profiler_table);
@@ -55,7 +69,10 @@ int main(int argc, char **argv) {
   g_mem_profile();
 #endif
 
-  attributes = LTTV_IATTRIBUTES(g_object_new(LTTV_ATTRIBUTES_TYPE));
+  g_type_init();
+  //g_type_init_with_debug_flags (G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_SIGNALS);
+
+  attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
 
   before_options = lttv_hooks_new();
   after_options = lttv_hooks_new();
@@ -64,22 +81,26 @@ int main(int argc, char **argv) {
 
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/options/before",
       LTTV_POINTER, &value));
-  *(value->v_pointer) = before_options;
+  *(value.v_pointer) = before_options;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/options/after",
       LTTV_POINTER, &value));
-  *(value->v_pointer) = after_options;
+  *(value.v_pointer) = after_options;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/before",
       LTTV_POINTER, &value));
-  *(value->v_pointer) = before_main;
+  *(value.v_pointer) = before_main;
   g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/after",
       LTTV_POINTER, &value));
-  *(value->v_pointer) = after_main;
+  *(value.v_pointer) = after_main;
 
 
   /* 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 */
 
@@ -88,18 +109,34 @@ int main(int argc, char **argv) {
   /* Add some built-in options */
 
   lttv_option_add("module",'m', "load a module", "name of module to load", 
-      LTTV_OPT_STRING, &aModule, lttv_module_option, NULL);
+      LTTV_OPT_STRING, &a_module, lttv_module_option, NULL);
  
   lttv_option_add("modules-path", 'L', 
       "add a directory to the module search path", 
-      "directory to add to the path", LTTV_OPT_STRING, &aModulePath, 
+      "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);
+
   lttv_hooks_call(before_main, NULL);
   lttv_hooks_call(after_main, NULL);
 
+  lttv_stats_destroy();
+  lttv_state_destroy();
   lttv_module_destroy();
   lttv_option_destroy();
 
@@ -116,9 +153,9 @@ int main(int argc, char **argv) {
 }
 
 
-lttv_attributes *lttv_global_attributes()
+LttvAttribute *lttv_global_attributes()
 {
-  return attributes;
+  return (LttvAttribute*)attributes;
 }
 
 
@@ -130,5 +167,31 @@ void lttv_module_option(void *hook_data)
 
 void lttv_module_path_option(void *hook_data)
 {
-  lttv_module_path_add(a_path);
+  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 */