Refine the interactions between the hooks provided by the different modules.

[lttv.git] / ltt / branches / poly / lttv / main.c

diff --git a/ltt/branches/poly/lttv/main.c b/ltt/branches/poly/lttv/main.c
index d44d8f51b90f623b88e462f45543a90131924b8a..b588e42910e3db6df84f8b2ded10215f11297970 100644 (file)
--- a/ltt/branches/poly/lttv/main.c
+++ b/ltt/branches/poly/lttv/main.c
@@ -1,56 +1,53 @@
 
 #include <lttv/hook.h>
 #include <lttv/module.h>
-
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
 #include <lttv/option.h>
+#include <lttv/traceset.h>
+#include <ltt/trace.h>
 
-#include <lttv/traceSet.h>
+void lttv_option_init(int argc, char **argv);
+void lttv_option_destroy();
+
+void lttv_module_init(int argc, char **argv);
+void lttv_module_destroy();
 
-#include <ltt/trace.h>
 /* 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 */
 
-/* Extensible array of popt command line options. Modules add options as
-   they are loaded and initialized. */
-
-
-static lttv_attributes *attributes_global;
+static LttvIAttributes *attributes;
 
-static lttv_hooks
-  *hooks_init_after,
-  *hooks_program_before,
-  *hooks_program_main,
-  *hooks_program_after;
+static LttvHooks
+  *before_options,
+  *after_options,
+  *before_main,
+  *after_main;
 
-// trace sets has to be put one in each new window_traceset
-static lttv_trace_set *traces;
+static char 
+  *a_module,
+  *a_module_path;
 
-static char *aModule, *aPath, *aTrace;
+static int a_argc;
 
-static int aArgc;
-
-static char **aArgv;
+static char **a_argv;
 
 static void lttv_module_option(void *hook_data);
 
 static void lttv_module_path_option(void *hook_data);
 
-static void lttv_trace_option(void *hook_data);
-
 #ifdef MEMDEBUG
 extern struct GMemVTable *glib_mem_profiler_table;
 #endif
 
+
 /* Since everything is done in modules, the main program only takes care
    of the infrastructure. */
 
 int main(int argc, char **argv) {
 
-  aArgc = argc;
-  aArgv = argv;
+  LttvAttributeValue *value;
 
 #ifdef MEMDEBUG
   g_mem_set_vtable(glib_mem_profiler_table);
@@ -58,35 +55,31 @@ int main(int argc, char **argv) {
   g_mem_profile();
 #endif
 
-  attributes_global = lttv_attributes_new();
-
-//  traces = lttv_trace_set_new();
-//  lttv_attributes_set_pointer_pathname(attributes_global, "trace_set/default", traces);
-
-  /* Initialize the hooks */
-
-  hooks_init_after = lttv_hooks_new();
-  lttv_attributes_set_pointer_pathname(attributes_global, "hooks/init/after", 
-      hooks_init_after);
+  attributes = LTTV_IATTRIBUTES(g_object_new(LTTV_ATTRIBUTES_TYPE));
 
+  before_options = lttv_hooks_new();
+  after_options = lttv_hooks_new();
+  before_main = lttv_hooks_new();
+  after_main = lttv_hooks_new();
 
-  hooks_program_before = lttv_hooks_new();
-  lttv_attributes_set_pointer_pathname(attributes_global, "hooks/program/before", 
-      hooks_program_before);
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/options/before",
+      LTTV_POINTER, &value));
+  *(value->v_pointer) = before_options;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/options/after",
+      LTTV_POINTER, &value));
+  *(value->v_pointer) = after_options;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/before",
+      LTTV_POINTER, &value));
+  *(value->v_pointer) = before_main;
+  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/after",
+      LTTV_POINTER, &value));
+  *(value->v_pointer) = after_main;
 
-  hooks_program_main = lttv_hooks_new();
-  lttv_attributes_set_pointer_pathname(attributes_global, "hooks/program/main", 
-      hooks_program_main);
-
-  hooks_program_after = lttv_hooks_new();
-  lttv_attributes_set_pointer_pathname(attributes_global, "hooks/program/after", 
-      hooks_program_after);
 
   /* Initialize the command line options processing */
 
   lttv_option_init(argc,argv);
   lttv_module_init(argc,argv);
-  // FIXME lttv_analyse_init(argc,argv);
 
   /* Initialize the module loading */
 
@@ -99,58 +92,43 @@ int main(int argc, char **argv) {
  
   lttv_option_add("modules-path", 'L', 
       "add a directory to the module search path", 
-      "directory to add to the path", LTTV_OPT_STRING, &aPath, 
+      "directory to add to the path", LTTV_OPT_STRING, &aModulePath, 
       lttv_module_path_option, NULL);
 
-  lttv_option_add("trace", 't', 
-      "add a trace to the trace set to analyse", 
-      "pathname of the directory containing the trace", 
-      LTTV_OPT_STRING, &aTrace, lttv_trace_option, NULL);
-
-  lttv_hooks_call(hooks_init_after, NULL);
-
-  lttv_hooks_call(hooks_program_before, NULL);
-  lttv_hooks_call(hooks_program_main, NULL);
-  lttv_hooks_call(hooks_program_after, NULL);
+  lttv_hooks_call(before_options, NULL);
+  lttv_hooks_call(after_options, NULL);
+  lttv_hooks_call(before_main, NULL);
+  lttv_hooks_call(after_main, NULL);
 
-  /* Finalize the command line options processing */
   lttv_module_destroy();
   lttv_option_destroy();
-  // FIXME lttv_analyse_destroy();
-  lttv_attributes_destroy(attributes_global);
+
+  lttv_hooks_destroy(before_options);
+  lttv_hooks_destroy(after_options);
+  lttv_hooks_destroy(before_main);
+  lttv_hooks_destroy(after_main);
+  g_object_unref(attributes);
 
 #ifdef MEMDEBUG
     g_message("Memory summary after main");
     g_mem_profile();
 #endif
-
-  
 }
 
+
 lttv_attributes *lttv_global_attributes()
 {
-       return attributes_global;
+  return attributes;
 }
 
 
 void lttv_module_option(void *hook_data)
 { 
-  lttv_module_load(aModule,aArgc,aArgv,STANDALONE);
+  lttv_module_load(a_module,a_argc,a_argv);
 }
 
 
 void lttv_module_path_option(void *hook_data)
 {
-  lttv_module_path_add(aPath);
+  lttv_module_path_add(a_path);
 }
-
-
-void lttv_trace_option(void *hook_data)
-{ 
-//  lttv_trace *trace;
-
-//  trace = lttv_trace_open(aTrace);
-//  if(trace == NULL) g_critical("cannot open trace %s", aTrace);
-//  lttv_trace_set_add(traces, trace);
-}
-