Correct a few syntax errors

git-svn-id: http://ltt.polymtl.ca/svn@167 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/include/lttv/Makefile.am b/ltt/branches/poly/include/lttv/Makefile.am
index a9fedc2ace82db5d85e3e43300941709bc37edbd..f5efe2c16716f10a5e96aea23b12ef32b4ca3f60 100644 (file)
--- a/ltt/branches/poly/include/lttv/Makefile.am
+++ b/ltt/branches/poly/include/lttv/Makefile.am
@@ -1 +1,2 @@
-lttvinclude_HEADERS = hook.h module.h traceWindow.h
+lttvinclude_HEADERS = hook.h module.h option.h lttv.h iattribute.h \
+               attribute.h processTrace.h state.h traceset.h traceWindow.h

diff --git a/ltt/branches/poly/include/lttv/hook.h b/ltt/branches/poly/include/lttv/hook.h
index 2fd17e1ac709ebb34c57cbf229a6a9ba3fe904e9..677bb8929bf872d7f10acd032787491290ff3bc8 100644 (file)
--- a/ltt/branches/poly/include/lttv/hook.h
+++ b/ltt/branches/poly/include/lttv/hook.h
@@ -12,7 +12,7 @@ typedef gboolean (*LttvHook)(void *hook_data, void *call_data);
 
 /* A list of hooks allows registering hooks to be called later. */
 
-typedef struct _LttvHooks LttvHooks;
+typedef GArray LttvHooks;
 
 
 /* Create and destroy a list of hooks */

diff --git a/ltt/branches/poly/include/lttv/iattribute.h b/ltt/branches/poly/include/lttv/iattribute.h
index e9f853cf67ee56661b4ca38ac69742ec5d6b36b2..944092a2b62e1a85780633983f8a530dc624d3ff 100644 (file)
--- a/ltt/branches/poly/include/lttv/iattribute.h
+++ b/ltt/branches/poly/include/lttv/iattribute.h
@@ -26,10 +26,10 @@ typedef union LttvAttributeValue {
   unsigned long *v_ulong;
   float *v_float;
   double *v_double;
-  timespec *v_timespec;
+  LttvTime *v_time;
   gpointer *v_pointer;
   char **v_string;
-  gobject **v_gobject;
+  GObject **v_gobject;
 } LttvAttributeValue;
 
 

diff --git a/ltt/branches/poly/include/lttv/lttv.h b/ltt/branches/poly/include/lttv/lttv.h
index 4f1fda61cfdfd4200521bfb461dffb5c79ca62c6..77dac57e7b8e85e47b58034ae355e1931f7f8ca1 100644 (file)
--- a/ltt/branches/poly/include/lttv/lttv.h
+++ b/ltt/branches/poly/include/lttv/lttv.h
@@ -1,12 +1,12 @@
 #ifndef LTTV_H
 #define LTTV_H
 
-#include "attribute.h"
+#include <lttv/attribute.h>
 
 /* The modules in the visualizer communicate with the main module and
    with each other through attributes. There is a global set of attributes */
 
-LttvAttributes *lttv_global_attributes();
+LttvAttribute *lttv_global_attributes();
 
 
 /* A number of global attributes are initialized before modules are

diff --git a/ltt/branches/poly/include/lttv/module.h b/ltt/branches/poly/include/lttv/module.h
index 6a0a45fba35fb64f58c76bc77ab2911266d20fb6..2649902c606d3f88b6bb212015c0472785b9ade1 100644 (file)
--- a/ltt/branches/poly/include/lttv/module.h
+++ b/ltt/branches/poly/include/lttv/module.h
@@ -24,7 +24,7 @@
 
 typedef struct _LttvModule LttvModule;
 
-typedef void (*LttvModuleInit)(int argc, char **argv);
+typedef void (*LttvModuleInit)(LttvModule *self, int argc, char **argv);
 
 typedef void (*LttvModuleDestroy)();
 

diff --git a/ltt/branches/poly/include/lttv/state.h b/ltt/branches/poly/include/lttv/state.h
index 4a4664d47d7ce0781fbca46c012b5f9091cd24a8..d7b265a340f173a02674c99f02a5db1157341d19 100644 (file)
--- a/ltt/branches/poly/include/lttv/state.h
+++ b/ltt/branches/poly/include/lttv/state.h
@@ -29,9 +29,9 @@
    like enumerations. */
 
 
-gboolean lttv_state_add_event_hooks(void *hook_data, void *call_data);
+gboolean lttv_state_add_event_hooks(LttvTracesetState *self);
 
-gboolean lttv_state_remove_event_hooks(void *hook_data, void *call_data);
+gboolean lttv_state_remove_event_hooks(LttvTracesetState *self);
 
 
 /* The interrupt type is one of "user mode", "kernel thread", "system call",
@@ -44,7 +44,7 @@ typedef GQuark LttvInterruptType;
    thread, which are the normal mode (interrupt stack bottom), it is set to
    "none". For interrupt requests, faults and system calls, it is set 
    respectively to the interrupt name (e.g. "timer"), fault name 
-   (e.g. "page fault"), and system call name (e.g. "select").
+   (e.g. "page fault"), and system call name (e.g. "select"). */
  
 typedef GQuark LttvInterruptNumber;
 

diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am
index 7741d505cedccdded20697ef197e82b740ed5061..3a50276f776461393fbfa3a04d86ec511aba32a2 100644 (file)
--- a/ltt/branches/poly/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/Makefile.am
@@ -3,18 +3,22 @@ SUBDIRS = modules
 AM_CFLAGS = $(GLIB_CFLAGS) 
 LIBS += $(GLIB_LIBS)
 
-bin_PROGRAMS = tracevisualizer
+bin_PROGRAMS = lttv
 
 #AM_CPPFLAGS = \
 #      -I$(top_srcdir)/include
 #INCLUDES=$(top_srcdir)/include
 
 tracevisualizer_SOURCES = main.c module.c option.c hook.c attribute.c \
-                attribute.h lttv.h option.h trace.h
+               iattribute.c processTrace.c state.c traceset.c
+#              lttv.h module.h option.h hook.h attribute.h \
+#                iattribute.h processTrace.h state.h traceset.h
 
 
-#libdir = ${lttvplugindir}
+libdir = ${lttvplugindir}
 
-#lib_LTLIBRARIES = libtextDump.la
-#libtextDump_la_LDFLAGS = -module
-#libtextDump_la_SOURCES = textDump.c
+lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la
+libtextDump_la_LDFLAGS = -module
+libtextDump_la_SOURCES = textDump.c
+libbatchAnalysis_la_LDFLAGS = -module
+libbatchAnalysis_la_SOURCES = batchAnalysis.c

diff --git a/ltt/branches/poly/lttv/batchAnalysis.c b/ltt/branches/poly/lttv/batchAnalysis.c
index 02b3dea4f1b9f65bccbdb2ab8b65fc66ecc13274..fa7f2c57cba1b7b78d54cac7ae37ba7019373e53 100644 (file)
--- a/ltt/branches/poly/lttv/batchAnalysis.c
+++ b/ltt/branches/poly/lttv/batchAnalysis.c
@@ -5,6 +5,7 @@
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
 #include <lttv/hook.h>
+#include <lttv/module.h>
 #include <lttv/processTrace.h>
 #include <lttv/state.h>
 
@@ -64,7 +65,7 @@ static void process_traceset(void *hook_data, void *call_data)
 }
 
 
-void init(int argc, char **argv)
+void init(LttvModule *self, int argc, char **argv)
 {
   LttvAttribute_value *value;
 

diff --git a/ltt/branches/poly/lttv/module.c b/ltt/branches/poly/lttv/module.c
index ccb2bddedb888976bc83a96d1c71d03454aec3eb..d207c0a7d016f367c73f148ad46d7abc26e21460 100644 (file)
--- a/ltt/branches/poly/lttv/module.c
+++ b/ltt/branches/poly/lttv/module.c
@@ -116,7 +116,7 @@ module_load(const char *name, int argc, char **argv)
     if(!g_module_symbol(gm, "init", (gpointer)&init_function)) {
       g_warning("module %s (%s) has no init function", name, pathname);
     }
-    else init_Function(argc,argv);
+    else init_Function(m, argc, argv);
   }
   else {
 

diff --git a/ltt/branches/poly/lttv/textDump.c b/ltt/branches/poly/lttv/textDump.c
index 189f9202515f61636858e7132b8d9ae409bb2931..3fb0b6f7e461bce80830803daba11de631b27288 100644 (file)
--- a/ltt/branches/poly/lttv/textDump.c
+++ b/ltt/branches/poly/lttv/textDump.c
@@ -2,6 +2,14 @@
    before each trace, to print each event, and to print statistics
    after each trace. */
 
+#include <lttv/lttv.h>
+#include <lttv/option.h>
+#include <lttv/module.h>
+#include <lttv/hook.h>
+#include <lttv/attribute.h>
+#include <lttv/iattribute.h>
+#include <lttv/state.h>
+
 static gboolean
   a_field_names,
   a_state;
@@ -18,9 +26,9 @@ static LttvHooks
 
 void init(int argc, char **argv)
 {
-  LttvAttribute_value *value;
+  LttvAttributeValue *value;
 
-  LttvIAttributes *attributes = LTTV_IATTRIBUTES(lttv_global_attributes());
+  LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
 
   a_file_name = NULL;
   lttv_option_add("output", 'o',