Correct syntax, not done but release often they say :-(

[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 b588e42910e3db6df84f8b2ded10215f11297970..1123af44429bf4d9f6b3fc8566a2ac049a15c311 100644 (file)
--- a/ltt/branches/poly/lttv/main.c
+++ b/ltt/branches/poly/lttv/main.c
@@ -2,6 +2,7 @@
 #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>
@@ -13,11 +14,14 @@ 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();
+
 /* 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,
@@ -47,7 +51,7 @@ extern struct GMemVTable *glib_mem_profiler_table;
 
 int main(int argc, char **argv) {
 
-  LttvAttributeValue *value;
+  LttvAttributeValue value;
 
 #ifdef MEMDEBUG
   g_mem_set_vtable(glib_mem_profiler_table);
@@ -55,7 +59,7 @@ int main(int argc, char **argv) {
   g_mem_profile();
 #endif
 
-  attributes = LTTV_IATTRIBUTES(g_object_new(LTTV_ATTRIBUTES_TYPE));
+  attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
 
   before_options = lttv_hooks_new();
   after_options = lttv_hooks_new();
@@ -64,22 +68,23 @@ 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 */
 
   lttv_option_init(argc,argv);
   lttv_module_init(argc,argv);
+  lttv_state_init(argc,argv);
 
   /* Initialize the module loading */
 
@@ -88,11 +93,11 @@ 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_hooks_call(before_options, NULL);
@@ -100,6 +105,7 @@ int main(int argc, char **argv) {
   lttv_hooks_call(before_main, NULL);
   lttv_hooks_call(after_main, NULL);
 
+  lttv_state_destroy();
   lttv_module_destroy();
   lttv_option_destroy();
 
@@ -116,7 +122,7 @@ int main(int argc, char **argv) {
 }
 
 
-lttv_attributes *lttv_global_attributes()
+LttvAttribute *lttv_global_attributes()
 {
   return attributes;
 }
@@ -130,5 +136,5 @@ 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);
 }