g_string_append fixups

[lttv.git] / ltt / branches / poly / lttv / modules / text / textFilter.c

diff --git a/ltt/branches/poly/lttv/modules/text/textFilter.c b/ltt/branches/poly/lttv/modules/text/textFilter.c
index 20b769cfa935dee3ed97ecb2003301b5bffc5842..afac4f91bc6cdcd4ae1e33e3ac996f55e615a1fc 100644 (file)
--- a/ltt/branches/poly/lttv/modules/text/textFilter.c
+++ b/ltt/branches/poly/lttv/modules/text/textFilter.c
@@ -25,6 +25,11 @@
  *  file containing filtering expressions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/option.h>
 #include <lttv/module.h>
@@ -38,16 +43,10 @@
 #include <ltt/type.h>
 #include <ltt/trace.h>
 #include <ltt/facility.h>
-#include <stdio.h>
 
 /* Insert the hooks before and after each trace and tracefile, and for each
    event. Print a global header. */
 
-/*
- *  YET TO BE ANSWERED !
- *  - why does this module need dependency with batchAnalysis ?
- */
-
 /*
  *  TODO
  *  - specify wich hook function will be used to call the core filter
@@ -88,10 +87,15 @@ void filter_analyze_file(void *hook_data) {
   g_assert(lttv_iattribute_find_by_path(attributes, "filter/expression",
       LTTV_POINTER, &value));
 
-  if(((GString*)*(value.v_pointer))->len != 0) g_string_append_c((GString*)*(value.v_pointer),'&');
-  g_string_append_c((GString*)*(value.v_pointer),'(');
-  g_string_append((GString*)*(value.v_pointer),a_file_content);
-  g_string_append_c((GString*)*(value.v_pointer),')');
+  if(((GString*)*(value.v_pointer))->len != 0)
+    (GString*)*(value.v_pointer) =
+      g_string_append_c((GString*)*(value.v_pointer),'&');
+  (GString*)*(value.v_pointer) = 
+     g_string_append_c((GString*)*(value.v_pointer),'(');
+  (GString*)*(value.v_pointer) = 
+    g_string_append((GString*)*(value.v_pointer),a_file_content);
+  (GString*)*(value.v_pointer) = 
+    g_string_append_c((GString*)*(value.v_pointer),')');
   
 }
 
@@ -113,10 +117,15 @@ void filter_analyze_string(void *hook_data) {
   g_assert(lttv_iattribute_find_by_path(attributes, "filter/expression",
       LTTV_POINTER, &value));
 
-  if(((GString*)*(value.v_pointer))->len != 0) g_string_append_c((GString*)*(value.v_pointer),'&');
-  g_string_append_c((GString*)*(value.v_pointer),'(');
-  g_string_append((GString*)*(value.v_pointer),a_string);
-  g_string_append_c((GString*)*(value.v_pointer),')');
+  if(((GString*)*(value.v_pointer))->len != 0)
+    (GString*)*(value.v_pointer) =
+      g_string_append_c((GString*)*(value.v_pointer),'&');
+  (GString*)*(value.v_pointer) = 
+    g_string_append_c((GString*)*(value.v_pointer),'(');
+  (GString*)*(value.v_pointer) = 
+    g_string_append((GString*)*(value.v_pointer),a_string);
+  (GString*)*(value.v_pointer) = 
+    g_string_append_c((GString*)*(value.v_pointer),')');
 
 }
 
@@ -130,20 +139,23 @@ void filter_list_commands(void *hook_data) {
 
   g_print("*** Possible fields ***\n");
   g_print("event.name (string)\n");
+  g_print("event.facility (string)\n");
   g_print("event.category (string)\n");
   g_print("event.time (double)\n");
   g_print("event.tsc (integer)\n");
+  g_print("event.field.facility_name.event_name.field_name.subfield_name (field_type)\n");
   g_print("tracefile.name (string)\n");
   g_print("trace.name (string)\n");
   g_print("state.pid (integer)\n");
   g_print("state.ppid (integer)\n");
   g_print("state.creation_time (double)\n");
-  g_print("trace.insertion_time (double)\n");
-  g_print("trace.process_name (string)\n");
-  g_print("trace.execution_mode (string)\n");
-  g_print("trace.execution_submode (string)\n");
-  g_print("trace.process_status (string)\n");
-  g_print("trace.cpu (string)\n\n");
+  g_print("state.insertion_time (double)\n");
+  g_print("state.process_name (string)\n");
+  g_print("state.thread_brand (string)\n");
+  g_print("state.execution_mode (string)\n");
+  g_print("state.execution_submode (string)\n");
+  g_print("state.process_status (string)\n");
+  g_print("state.cpu (string)\n\n");
   
   g_print("*** Possible operators ***\n");
   g_print("equal '='\n");