X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=d6defdf713729f1c0f05bd498a5b1d67189962ba;hb=348c6ba830cba63cc5486e2cea042c8a70cf1fb2;hp=5473c68f3ed8f7f653f3359084b7df52e2faebb1;hpb=4d9ff9421ad51cef878f7a2e70faacf96001768e;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c
index 5473c68f..d6defdf7 100644
--- a/ltt/branches/poly/lttv/lttv/filter.c
+++ b/ltt/branches/poly/lttv/lttv/filter.c
@@ -1,5 +1,5 @@
 /* This file is part of the Linux Trace Toolkit viewer
- * Copyright (C) 2003-2005 Michel Dagenais
+ * Copyright (C) 2003-2005 Michel Dagenais and Simon Bouvier-Zappa
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -16,72 +16,68 @@
  * MA 02111-1307, USA.
  */
 
-/*
-  read_token
-
-  read_expression
-    ( read expr )
-    simple expr [ op expr ]
-
-  read_simple_expression
-    read_field_path [ rel value ]
-
-  read_field_path
-    read_field_component [. field path]
-
-  read_field_component
-    name [ \[ value \] ]
-
-  data struct:
-  and/or(left/right)
-  not(child)
-  op(left/right)
-  path(component...) -> field
-   
-  consist in AND, OR and NOT nested expressions, forming a tree with 
-  simple relations as leaves. The simple relations test is a field
-  in an event is equal, not equal, smaller, smaller or equal, larger, or
-  larger or equal to a specified value. 
-*/
-
-/*
- *  YET TO BE ANSWERED
- *  - none yet
+/*! \file lttv/lttv/filter.c
+ *  \brief Defines the core filter of application
+ *
+ *  consist in AND, OR and NOT nested expressions, forming a tree with 
+ *  simple relations as leaves. The simple relations test if a field
+ *  in an event is equal, not equal, smaller, smaller or equal, larger, or
+ *  larger or equal to a specified value.
+ *
+ *  Fields specified in a simple expression can take following 
+ *  values
+ *
+ *  \verbatim
+ *  LttvTracefileContext{} 
+ *  |->event\ 
+ *  | |->name (String, converted to GQuark)
+ *  | |->category (String, not yet implemented)
+ *  | |->time (LttTime)
+ *  | |->tsc (LttCycleCount --> uint64)
+ *  | |->fields
+ *  |   |->"event name"
+ *  |     |->"field name"
+ *  |       |->"sub-field name"
+ *  |         |->...
+ *  |           |->"leaf-field name" (field type)
+ *  |->tracefile
+ *  | |->name (String, converted to GQuark)
+ *  |->trace
+ *  | |->name (String, converted to GQuark)
+ *  |->state
+ *    |->pid (uint64)
+ *    |->ppid (uint64)
+ *    |->creation_time (LttTime)
+ *    |->insertion_time (LttTime)
+ *    |->process_name (String, converted to GQuark)
+ *    |->execution_mode (LttvExecutionMode)
+ *    |->execution_submode (LttvExecutionSubmode)
+ *    |->process_status (LttvProcessStatus)
+ *    |->cpu (GQuark)
+ *  \endverbatim
  */
 
 /*
- *  TODO 
+ *  \todo 
  *  - refine switch of expression in multiple uses functions
- *    - remove the idle expressions in the tree **** 
- *  - add the current simple expression to the tree
- *    * clear the field_path array after use
+ *  - remove the idle expressions in the tree 
  */
 
-#include <lttv/filter.h>
-#include <ltt/time.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-/*
-GQuark
-  LTTV_FILTER_TRACE,
-  LTTV_FILTER_TRACESET,
-  LTTV_FILTER_TRACEFILE,
-  LTTV_FILTER_STATE,
-  LTTV_FILTER_EVENT,
-  LTTV_FILTER_NAME,
-  LTTV_FILTER_CATEGORY,
-  LTTV_FILTER_TIME,
-  LTTV_FILTER_TSC,
-  LTTV_FILTER_PID,
-  LTTV_FILTER_PPID,
-  LTTV_FILTER_C_TIME,
-  LTTV_FILTER_I_TIME,
-  LTTV_FILTER_P_NAME,
-  LTTV_FILTER_EX_MODE,
-  LTTV_FILTER_EX_SUBMODE,
-  LTTV_FILTER_P_STATUS,
-  LTTV_FILTER_CPU;
-*/
+//#define TEST
+#ifdef TEST
+#include <time.h>
+#include <sys/time.h>
+#endif
 
+#include <lttv/filter.h>
+#include <ltt/trace.h>
+#include <ltt/type.h>
+#include <stdlib.h>
+#include <string.h>
 
 /**
  * @fn LttvSimpleExpression* lttv_simple_expression_new()
@@ -97,13 +93,12 @@ lttv_simple_expression_new() {
   se->field = LTTV_FILTER_UNDEFINED;
   se->op = NULL;
   se->offset = 0;
-//  se->value.v_uint64 = 0;
 
   return se;
 }
 
 /**
- *  @fn gboolean lttv_simple_expression_add_field(GPtrArray*,LttvSimpleExpression*)
+ *  @fn gboolean lttv_simple_expression_assign_field(GPtrArray*,LttvSimpleExpression*)
  * 
  *  Parse through filtering field hierarchy as specified 
  *  by user.  This function compares each value to 
@@ -118,7 +113,7 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
   GString* f = NULL;
   
   if(fp->len < 2) return FALSE;
-  g_assert(f=g_ptr_array_remove_index(fp,0)); 
+  g_assert((f=g_ptr_array_remove_index(fp,0))); 
   
   /*
    * Parse through the specified 
@@ -250,9 +245,11 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
  *  Sets the function pointer for the current
  *  Simple Expression
  *  @param se current simple expression
+ *  @param op current operator
  *  @return success/failure of operation
  */
-gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionOp op) {
+gboolean 
+lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionOp op) {
      
   switch(se->field) {
      /* 
@@ -262,12 +259,16 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
      case LTTV_FILTER_TRACEFILE_NAME:
      case LTTV_FILTER_STATE_P_NAME:
      case LTTV_FILTER_EVENT_NAME:
+     case LTTV_FILTER_STATE_CPU:
+     case LTTV_FILTER_STATE_EX_MODE:
+     case LTTV_FILTER_STATE_EX_SUBMODE:
+     case LTTV_FILTER_STATE_P_STATUS:
        switch(op) {
          case LTTV_FIELD_EQ:
-           se->op = lttv_apply_op_eq_string;
+           se->op = lttv_apply_op_eq_quark;
            break;
          case LTTV_FIELD_NE:
-           se->op = lttv_apply_op_ne_string;
+           se->op = lttv_apply_op_ne_quark;
            break;
          default:
            g_warning("Error encountered in operator assignment = or != expected");
@@ -279,9 +280,7 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
       */
      case LTTV_FILTER_STATE_PID:
      case LTTV_FILTER_STATE_PPID:
-     case LTTV_FILTER_STATE_EX_MODE:
-     case LTTV_FILTER_STATE_EX_SUBMODE:
-     case LTTV_FILTER_STATE_P_STATUS:
+     case LTTV_FILTER_EVENT_TSC:
        switch(op) {
          case LTTV_FIELD_EQ:
            se->op = lttv_apply_op_eq_uint64;
@@ -306,13 +305,34 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
            return FALSE;
        }
        break;
+     /*
+      * Enums
+      * Entered as string, converted to enum
+      * 
+      * can only be compared with 'equal' or 'not equal' operators
+      *
+      * unsigned int of 16 bits are used here since enums 
+      * should not go over 2^16-1 values
+      */
+//      case /*NOTHING*/:
+//       switch(op) {
+//         case LTTV_FIELD_EQ:
+//           se->op = lttv_apply_op_eq_uint16;
+//           break;
+//         case LTTV_FIELD_NE:
+//           se->op = lttv_apply_op_ne_uint16;
+//           break;
+//         default:
+//           g_warning("Error encountered in operator assignment = or != expected");
+//           return FALSE;
+//       }
+//       break;
      /*
       * Ltttime
       */
      case LTTV_FILTER_STATE_CT:
      case LTTV_FILTER_STATE_IT:
      case LTTV_FILTER_EVENT_TIME:
-     case LTTV_FILTER_EVENT_TSC:
        switch(op) {
          case LTTV_FIELD_EQ:
            se->op = lttv_apply_op_eq_ltttime;
@@ -347,38 +367,43 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
 }
 
 /**
- *  @fn void lttv_simple_expression_assign_value(LttvSimpleExpression*,char*)
+ *  @fn gboolean lttv_simple_expression_assign_value(LttvSimpleExpression*,char*)
  *
  *  Assign the value field to the current LttvSimpleExpression
  *  @param se pointer to the current LttvSimpleExpression
  *  @param value string value for simple expression
  */
-gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
+gboolean 
+lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
 
-//  g_print("se->value:%s\n",value);
   unsigned i;
   gboolean is_double = FALSE;
-  LttTime t;
-  GString* v; 
+  LttTime t = ltt_time_zero;
+  GString* v;
   
   switch(se->field) {
      /* 
-      * string
+      * Strings
+      * entered as strings, converted to Quarks
       */
      case LTTV_FILTER_TRACE_NAME:
      case LTTV_FILTER_TRACEFILE_NAME:
      case LTTV_FILTER_STATE_P_NAME:
      case LTTV_FILTER_EVENT_NAME:
-       se->value.v_string = value;
+     case LTTV_FILTER_STATE_CPU:
+     case LTTV_FILTER_STATE_EX_MODE:
+     case LTTV_FILTER_STATE_EX_SUBMODE:
+     case LTTV_FILTER_STATE_P_STATUS:
+      // se->value.v_string = value;
+       se->value.v_uint32 = g_quark_from_string(value);
+       g_free(value);
        break;
      /* 
-      * integer
+      * integer -- supposed to be uint64
       */
      case LTTV_FILTER_STATE_PID:
      case LTTV_FILTER_STATE_PPID:
-     case LTTV_FILTER_STATE_EX_MODE:
-     case LTTV_FILTER_STATE_EX_SUBMODE:
-     case LTTV_FILTER_STATE_P_STATUS:
+     case LTTV_FILTER_EVENT_TSC:
        se->value.v_uint64 = atoi(value);
        g_free(value);
        break;
@@ -388,7 +413,6 @@ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* val
      case LTTV_FILTER_STATE_CT:
      case LTTV_FILTER_STATE_IT:
      case LTTV_FILTER_EVENT_TIME:
-     case LTTV_FILTER_EVENT_TSC:
        //se->value.v_double = atof(value);
        /*
         * parsing logic could be optimised,
@@ -400,14 +424,15 @@ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* val
               /* cannot specify number with more than one '.' */
               if(is_double) return FALSE; 
               else is_double = TRUE;
-              t.tv_sec = atoi(v);
+              t.tv_sec = atoi(v->str);
               g_string_free(v,TRUE);
               v = g_string_new("");
           } else g_string_append_c(v,value[i]);
        }
        /* number can be integer or double */
-       if(is_double) t.tv_nsec = atoi(v);
-       else t.tv_nsec = 0;
+       if(is_double) t.tv_nsec = atoi(v->str);
+       else t.tv_sec = atoi(v->str);
+       
        g_string_free(v,TRUE);
        
        se->value.v_ltttime = t;
@@ -415,6 +440,7 @@ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* val
        break;
      default:
        g_warning("Error encountered in value assignation ! Field type = %i",se->field);
+       g_free(value);
        return FALSE;
    }
   
@@ -433,14 +459,14 @@ void
 lttv_simple_expression_destroy(LttvSimpleExpression* se) {
   
  // g_free(se->value);
-  switch(se->field) {
-     case LTTV_FILTER_TRACE_NAME:
-     case LTTV_FILTER_TRACEFILE_NAME:
-     case LTTV_FILTER_STATE_P_NAME:
-     case LTTV_FILTER_EVENT_NAME:
-       g_free(se->value.v_string);
-       break;
-  }
+//  switch(se->field) {
+//     case LTTV_FILTER_TRACE_NAME:
+//     case LTTV_FILTER_TRACEFILE_NAME:
+//     case LTTV_FILTER_STATE_P_NAME:
+//     case LTTV_FILTER_EVENT_NAME:
+//       g_free(se->value.v_string);
+//       break;
+//  }
   g_free(se);
 
 }
@@ -487,7 +513,7 @@ lttv_struct_type(gint ft) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -503,7 +529,7 @@ gboolean lttv_apply_op_eq_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -517,7 +543,7 @@ gboolean lttv_apply_op_eq_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -531,7 +557,7 @@ gboolean lttv_apply_op_eq_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -545,7 +571,7 @@ gboolean lttv_apply_op_eq_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_string(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_string(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -559,7 +585,22 @@ gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_eq_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_eq_quark(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'equal' operator to the
+ *  specified structure and value 
+ *  @param v1 left member of comparison
+ *  @param v2 right member of comparison
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_quark(const gpointer v1, LttvFieldValue v2) {
+  GQuark* r = (GQuark*) v1;
+//  g_print("v1:%i v2:%i\n",*r,v2.v_uint32);
+  return (*r == v2.v_uint32);
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_eq_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'equal' operator to the
  *  specified structure and value 
@@ -569,12 +610,12 @@ gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_eq_ltttime(const gpointer v1, LttvFieldValue v2) {
   LttTime* r = (LttTime*) v1;
-  return ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec == v2.v_ltttime.tv_nsec));
+  return ltt_time_compare(*r, v2.v_ltttime)==0?1:0;
 }
 
 
 /**
- *  @fn gboolean lttv_apply_op_ne_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -588,7 +629,7 @@ gboolean lttv_apply_op_ne_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ne_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -602,7 +643,7 @@ gboolean lttv_apply_op_ne_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ne_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -616,7 +657,7 @@ gboolean lttv_apply_op_ne_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ne_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -630,7 +671,7 @@ gboolean lttv_apply_op_ne_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ne_string(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_string(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -644,7 +685,22 @@ gboolean lttv_apply_op_ne_string(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ne_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ne_quark(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value 
+ *  @param v1 left member of comparison
+ *  @param v2 right member of comparison
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_quark(const gpointer v1, LttvFieldValue v2) {
+  GQuark* r = (GQuark*) v1;
+  return (*r != v2.v_uint32);
+}
+
+
+/**
+ *  @fn gboolean lttv_apply_op_ne_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'not equal' operator to the
  *  specified structure and value 
@@ -659,7 +715,7 @@ gboolean lttv_apply_op_ne_ltttime(const gpointer v1, LttvFieldValue v2) {
 
 
 /**
- *  @fn gboolean lttv_apply_op_lt_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_lt_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower than' operator to the
  *  specified structure and value 
@@ -673,7 +729,7 @@ gboolean lttv_apply_op_lt_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_lt_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_lt_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower than' operator to the
  *  specified structure and value 
@@ -687,7 +743,7 @@ gboolean lttv_apply_op_lt_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_lt_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_lt_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower than' operator to the
  *  specified structure and value 
@@ -701,7 +757,7 @@ gboolean lttv_apply_op_lt_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_lt_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_lt_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower than' operator to the
  *  specified structure and value 
@@ -715,7 +771,7 @@ gboolean lttv_apply_op_lt_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_lt_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_lt_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower than' operator to the
  *  specified structure and value 
@@ -725,12 +781,13 @@ gboolean lttv_apply_op_lt_double(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_lt_ltttime(const gpointer v1, LttvFieldValue v2) {
   LttTime* r = (LttTime*) v1;
-  return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec < v2.v_ltttime.tv_nsec)));
+//  return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec < v2.v_ltttime.tv_nsec)));
+  return ltt_time_compare(*r, v2.v_ltttime)==-1?1:0;
 }
 
 
 /**
- *  @fn gboolean lttv_apply_op_le_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_le_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower or equal' operator to the
  *  specified structure and value 
@@ -744,7 +801,7 @@ gboolean lttv_apply_op_le_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_le_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_le_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower or equal' operator to the
  *  specified structure and value 
@@ -758,7 +815,7 @@ gboolean lttv_apply_op_le_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_le_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_le_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower or equal' operator to the
  *  specified structure and value 
@@ -772,7 +829,7 @@ gboolean lttv_apply_op_le_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_le_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_le_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower or equal' operator to the
  *  specified structure and value 
@@ -786,7 +843,7 @@ gboolean lttv_apply_op_le_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_le_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_le_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'lower or equal' operator to the
  *  specified structure and value 
@@ -796,12 +853,13 @@ gboolean lttv_apply_op_le_double(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_le_ltttime(const gpointer v1, LttvFieldValue v2) {
   LttTime* r = (LttTime*) v1;
-  return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec <= v2.v_ltttime.tv_nsec)));
+//  return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec <= v2.v_ltttime.tv_nsec)));
+  return ltt_time_compare(*r, v2.v_ltttime)<1?1:0;
 }
 
 
 /**
- *  @fn gboolean lttv_apply_op_gt_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_gt_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater than' operator to the
  *  specified structure and value 
@@ -815,7 +873,7 @@ gboolean lttv_apply_op_gt_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_gt_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_gt_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater than' operator to the
  *  specified structure and value 
@@ -829,7 +887,7 @@ gboolean lttv_apply_op_gt_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_gt_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_gt_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater than' operator to the
  *  specified structure and value 
@@ -843,7 +901,7 @@ gboolean lttv_apply_op_gt_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_gt_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_gt_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater than' operator to the
  *  specified structure and value 
@@ -857,7 +915,7 @@ gboolean lttv_apply_op_gt_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_gt_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_gt_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater than' operator to the
  *  specified structure and value 
@@ -867,12 +925,13 @@ gboolean lttv_apply_op_gt_double(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_gt_ltttime(const gpointer v1, LttvFieldValue v2) {
   LttTime* r = (LttTime*) v1;
-  return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec > v2.v_ltttime.tv_nsec)));
+//  return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec > v2.v_ltttime.tv_nsec)));
+  return ltt_time_compare(*r, v2.v_ltttime)==1?1:0;
 }
 
 
 /**
- *  @fn gboolean lttv_apply_op_ge_uint64(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_uint64(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -886,7 +945,7 @@ gboolean lttv_apply_op_ge_uint64(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ge_uint32(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_uint32(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -900,7 +959,7 @@ gboolean lttv_apply_op_ge_uint32(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ge_uint16(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_uint16(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -914,7 +973,7 @@ gboolean lttv_apply_op_ge_uint16(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
-  *  @fn gboolean lttv_apply_op_ge_double(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -928,7 +987,7 @@ gboolean lttv_apply_op_ge_double(const gpointer v1, LttvFieldValue v2) {
 }
 
 /**
- *  @fn gboolean lttv_apply_op_ge_ltttime(const gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_ltttime(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -938,14 +997,13 @@ gboolean lttv_apply_op_ge_double(const gpointer v1, LttvFieldValue v2) {
  */
 gboolean lttv_apply_op_ge_ltttime(const gpointer v1, LttvFieldValue v2) {
   LttTime* r = (LttTime*) v1;
-  return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec >= v2.v_ltttime.tv_nsec)));
+//  return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec >= v2.v_ltttime.tv_nsec)));
+  return ltt_time_compare(*r, v2.v_ltttime)>-1?1:0;
 }
 
 
 
 /**
- *  @fn LttvFilterTree* lttv_filter_tree_clone(LttvFilterTree*)
- * 
  *  Makes a copy of the current filter tree
  *  @param tree pointer to the current tree
  *  @return new copy of the filter tree
@@ -985,18 +1043,17 @@ lttv_filter_tree_clone(const LttvFilterTree* tree) {
 }
 
 /**
- *  @fn LttvFilter* lttv_filter_clone(LttvFilter*)
- * 
  *  Makes a copy of the current filter
  *  @param filter pointer to the current filter
  *  @return new copy of the filter
  */
 LttvFilter*
 lttv_filter_clone(const LttvFilter* filter) {
-    
+ 
+	if(!filter) return NULL;
+
   LttvFilter* newfilter = g_new(LttvFilter,1); 
 
-  // newfilter->expression = g_new(char,1)
   strcpy(newfilter->expression,filter->expression);
 
   newfilter->head = lttv_filter_tree_clone(filter->head);
@@ -1009,10 +1066,8 @@ lttv_filter_clone(const LttvFilter* filter) {
 /**
  *  @fn LttvFilter* lttv_filter_new()
  * 
- * 	Creates a new lttv_filter
- * 	@param expression filtering options string
- * 	@param t pointer to the current LttvTrace
- * 	@return the current lttv_filter or NULL if error
+ * 	Creates a new LttvFilter
+ * 	@return the current LttvFilter or NULL if error
  */
 LttvFilter*
 lttv_filter_new() {
@@ -1020,6 +1075,8 @@ lttv_filter_new() {
   LttvFilter* filter = g_new(LttvFilter,1);
   filter->expression = NULL;
   filter->head = NULL;
+
+  return filter;
     
 }
 
@@ -1040,14 +1097,16 @@ lttv_filter_update(LttvFilter* filter) {
   
   int	
     i, 
-    p_nesting=0;	/* parenthesis nesting value */
-
+    p_nesting=0,	/* parenthesis nesting value */
+    not=0;
+    
   /* trees */
   LttvFilterTree
     *tree = lttv_filter_tree_new(),   /* main tree */
     *subtree = NULL,                  /* buffer for subtrees */
     *t1,                              /* buffer #1 */
-    *t2;                              /* buffer #2 */
+    *t2,                              /* buffer #2 */
+    *t3;                              /* buffer #3 */
 
   /* 
    * the filter
@@ -1106,38 +1165,53 @@ lttv_filter_update(LttvFilter* filter) {
    *    2. the subtree is completed, allocate a new subtree
    *    3. pop the tree value from the tree stack
    */
+ 
+#ifdef TEST
+  struct timeval starttime;
+  struct timeval endtime;
+  gettimeofday(&starttime, NULL);
+#endif
   
   for(i=0;i<strlen(filter->expression);i++) {
     // debug
-    //g_print("%c ",filter->expression[i]);
+//    g_print("%c\n ",filter->expression[i]);
     
     switch(filter->expression[i]) {
       /*
        *   logical operators
        */
       case '&':   /* and */
-   
+    
+        /* get current tree in tree stack */
         t1 = (LttvFilterTree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+
+        /* get current node at absolute right */
         while(t1->right != LTTV_TREE_IDLE) {
           g_assert(t1->right == LTTV_TREE_NODE);
           t1 = t1->r_child.t;
         }
         t2 = lttv_filter_tree_new();
         t2->node = LTTV_LOGICAL_AND;
+        t1->right = LTTV_TREE_NODE;
+        t1->r_child.t = t2;
+        if(not) {   /* add not operator to tree */
+          t3 = lttv_filter_tree_new();
+          t3->node = LTTV_LOGICAL_NOT;
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = t3;
+          t2 = t3;
+          not = 0;
+        }
         if(subtree != NULL) {   /* append subtree to current tree */
           t2->left = LTTV_TREE_NODE;
           t2->l_child.t = subtree;
           subtree = NULL;
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2;
         } else {  /* append a simple expression */
           lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
           t2->left = LTTV_TREE_LEAF;
           t2->l_child.leaf = a_simple_expression;
           a_simple_expression = lttv_simple_expression_new(); 
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2;
         }
         break;
       
@@ -1150,20 +1224,26 @@ lttv_filter_update(LttvFilter* filter) {
         }
         t2 = lttv_filter_tree_new();
         t2->node = LTTV_LOGICAL_OR;
-        if(subtree != NULL) {   /* append subtree to current tree */
+        t1->right = LTTV_TREE_NODE;
+        t1->r_child.t = t2;
+        if(not) { // add not operator to tree
+          t3 = lttv_filter_tree_new();
+          t3->node = LTTV_LOGICAL_NOT;
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = t3;
+          t2 = t3;
+          not = 0;
+       }
+       if(subtree != NULL) {   /* append subtree to current tree */
           t2->left = LTTV_TREE_NODE;
           t2->l_child.t = subtree;
           subtree = NULL;
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2;
-        } else {    /* append a simple expression */
+       } else {    /* append a simple expression */
           lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
           t2->left = LTTV_TREE_LEAF;
           t2->l_child.leaf = a_simple_expression;
           a_simple_expression = lttv_simple_expression_new();
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2; 
         }
         break;
       
@@ -1176,20 +1256,26 @@ lttv_filter_update(LttvFilter* filter) {
         }
         t2 = lttv_filter_tree_new();
         t2->node = LTTV_LOGICAL_XOR;
+        t1->right = LTTV_TREE_NODE;
+        t1->r_child.t = t2;
+        if(not) { // add not operator to tree
+          t3 = lttv_filter_tree_new();
+          t3->node = LTTV_LOGICAL_NOT;
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = t3;
+          t2 = t3;
+          not = 0;
+        }
         if(subtree != NULL) {   /* append subtree to current tree */
           t2->left = LTTV_TREE_NODE;
           t2->l_child.t = subtree;
           subtree = NULL;
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2;
         } else {    /* append a simple expression */
           lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
           t2->left = LTTV_TREE_LEAF;
           t2->l_child.leaf = a_simple_expression;
           a_simple_expression = lttv_simple_expression_new(); 
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2; 
         }
         break;
       
@@ -1202,15 +1288,7 @@ lttv_filter_update(LttvFilter* filter) {
           lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_NE);
           i++;
         } else {  /* ! */
-          t1 = (LttvFilterTree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
-          while(t1->right != LTTV_TREE_IDLE) {
-             g_assert(t1->right == LTTV_TREE_NODE);
-             t1 = t1->r_child.t;
-          }
-          t2 = lttv_filter_tree_new();
-          t2->node = LTTV_LOGICAL_NOT;
-          t1->right = LTTV_TREE_NODE;
-          t1->r_child.t = t2;
+          not=1;
         }
         break;
       
@@ -1220,6 +1298,13 @@ lttv_filter_update(LttvFilter* filter) {
         
         p_nesting++;      /* incrementing parenthesis nesting value */
         t1 = lttv_filter_tree_new();
+        if(not) { /* add not operator to tree */
+          t3 = lttv_filter_tree_new();
+          t3->node = LTTV_LOGICAL_NOT;
+          t1->right = LTTV_TREE_NODE;
+          t1->r_child.t = t3;
+          not = 0;
+        }
         g_ptr_array_add( tree_stack,(gpointer) t1 );
         break;
       
@@ -1236,13 +1321,21 @@ lttv_filter_update(LttvFilter* filter) {
   
         /* there must at least be the root tree left in the array */
         g_assert(tree_stack->len>0);
-        
+ 
+        t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
+        while(t1->right != LTTV_TREE_IDLE) {
+           t1 = t1->r_child.t;
+        }
+        if(not) { // add not operator to tree
+          g_print("ici");
+          t3 = lttv_filter_tree_new();
+          t3->node = LTTV_LOGICAL_NOT;
+          t1->right = LTTV_TREE_NODE;
+          t1->r_child.t = t3;
+          t1 = t3;
+          not = 0;
+        }
         if(subtree != NULL) {   /* append subtree to current tree */
-          t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
-          while(t1->right != LTTV_TREE_IDLE) {
-             g_assert(t1->right == LTTV_TREE_NODE);
-             t1 = t1->r_child.t;
-          }
           t1->right = LTTV_TREE_NODE;
           t1->r_child.t = subtree;
           subtree = g_ptr_array_index(tree_stack,tree_stack->len-1);
@@ -1250,12 +1343,6 @@ lttv_filter_update(LttvFilter* filter) {
         } else {    /* assign subtree as current tree */
           lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
-          t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
-          while(t1->right != LTTV_TREE_IDLE) {
-             g_assert(t1->right == LTTV_TREE_NODE);
-             g_assert(t1->r_child.t != NULL);
-             t1 = t1->r_child.t;
-          }
           t1->right = LTTV_TREE_LEAF;
           t1->r_child.leaf = a_simple_expression;
           a_simple_expression = lttv_simple_expression_new(); 
@@ -1333,12 +1420,22 @@ lttv_filter_update(LttvFilter* filter) {
   if(tree_stack->len != 1) /* only root tree should remain */ 
     return FALSE;
   
-  /*  processing last element of expression   */
+  /*  
+   *  processing last element of expression   
+   */
   t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
   while(t1->right != LTTV_TREE_IDLE) {
     g_assert(t1->right == LTTV_TREE_NODE);
     t1 = t1->r_child.t;
   }
+  if(not) { // add not operator to tree
+     t3 = lttv_filter_tree_new();
+     t3->node = LTTV_LOGICAL_NOT;
+     t1->right = LTTV_TREE_NODE;
+     t1->r_child.t = t3;
+     t1 = t3;
+     not = 0;
+  }
   if(subtree != NULL) {  /* add the subtree */
     t1->right = LTTV_TREE_NODE;
     t1->r_child.t = subtree;
@@ -1368,10 +1465,20 @@ lttv_filter_update(LttvFilter* filter) {
   
   g_assert(filter->head != NULL); /* tree should exist */
   g_assert(subtree == NULL); /* remaining subtree should be included in main tree */
+ 
+#ifdef TEST
+  gettimeofday(&endtime, NULL);
+
+  /* Calcul du temps de l'algorithme */
+  double time1 = starttime.tv_sec + (starttime.tv_usec/1000000.0);
+  double time2 = endtime.tv_sec + (endtime.tv_usec/1000000.0);
+// g_print("Tree build took %.10f ms for strlen of %i\n",(time2-time1)*1000,strlen(filter->expression));
+  g_print("%.10f %i\n",(time2-time1)*1000,strlen(filter->expression));
+#endif
   
   /* debug */
   g_print("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n");
-  lttv_print_tree(filter->head) ;
+  lttv_print_tree(filter->head,0) ;
   g_print("+++++++++++++++ END PRINT ++++++++++++++++++\n");
   
   /* success */
@@ -1388,8 +1495,12 @@ lttv_filter_update(LttvFilter* filter) {
 void
 lttv_filter_destroy(LttvFilter* filter) {
   
-  g_free(filter->expression);
-  lttv_filter_tree_destroy(filter->head);
+	if(!filter) return;
+
+	if(filter->expression)
+	  g_free(filter->expression);
+	if(filter->head)
+	  lttv_filter_tree_destroy(filter->head);
   g_free(filter);
   
 }
@@ -1424,21 +1535,24 @@ lttv_filter_tree_new() {
  *  @param expression string that must be appended
  *  @return Success/Failure of operation
  */
-gboolean lttv_filter_append_expression(LttvFilter* filter, char *expression) {
+gboolean 
+lttv_filter_append_expression(LttvFilter* filter, const char *expression) {
 
   if(expression == NULL) return FALSE;
-  if(filter == NULL) {
-    filter = lttv_filter_new(); 
-    filter->expression = expression;
-  } else if(filter->expression == NULL) {
-    filter->expression = expression;
-  } else {
-    filter->expression = g_strconcat(filter->expression,"&",expression);
-    
-    /* clear expression */
-    g_free(expression);
-  }
+  if(filter == NULL) return FALSE;
+  if(expression[0] == '\0') return FALSE;  /* Empty expression */
 
+  GString* s = g_string_new("");
+  if(filter->expression != NULL) {
+    g_string_append(s,filter->expression);
+    g_string_append_c(s,'&');
+  }
+  g_string_append(s,expression);
+ 
+  g_free(filter->expression);
+  filter->expression = g_string_free(s,FALSE);
+  
+  /* TRUE if construction of tree proceeded without errors */
   return lttv_filter_update(filter);
   
 }
@@ -1450,7 +1564,8 @@ gboolean lttv_filter_append_expression(LttvFilter* filter, char *expression) {
  *  current filter and sets its pointer to NULL
  *  @param filter pointer to the current LttvFilter
  */
-void lttv_filter_clear_expression(LttvFilter* filter) {
+void 
+lttv_filter_clear_expression(LttvFilter* filter) {
   
   if(filter->expression != NULL) {
     g_free(filter->expression);
@@ -1481,11 +1596,9 @@ lttv_filter_tree_destroy(LttvFilterTree* tree) {
 }
 
 /**
- *  @fn gboolean lttv_filter_tree_parse(LttvFilterTree*,LttEvent,LttTracefile,LttTrace,LttvProcessState)
- * 
  *  Global parsing function for the current
  *  LttvFilterTree
- *  @param tree pointer to the current LttvFilterTree
+ *  @param t pointer to the current LttvFilterTree
  *  @param event current LttEvent, NULL if not used
  *  @param tracefile current LttTracefile, NULL if not used
  *  @param trace current LttTrace, NULL if not used
@@ -1567,7 +1680,8 @@ lttv_filter_tree_parse(
   else if(t->right == LTTV_TREE_LEAF) {
       rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context);
   }
-   
+
+  
   /*
    * Apply and return the 
    * logical link between the 
@@ -1576,7 +1690,8 @@ lttv_filter_tree_parse(
   switch(t->node) {
     case LTTV_LOGICAL_OR: return (lresult | rresult);
     case LTTV_LOGICAL_AND: return (lresult & rresult);
-    case LTTV_LOGICAL_NOT: return (!rresult);
+    case LTTV_LOGICAL_NOT: 
+      return (t->left==LTTV_TREE_LEAF)?!lresult:((t->right==LTTV_TREE_LEAF)?!rresult:TRUE);
     case LTTV_LOGICAL_XOR: return (lresult ^ rresult);
     case 0: return (rresult);
     default: 
@@ -1591,10 +1706,8 @@ lttv_filter_tree_parse(
 }
 
 /**
- *  @fn gboolean lttv_filter_tree_parse_branch(LttvFilterTree*,LttEvent*,LttTracefile*,LttTrace*,LttvProcessState*,LttvTracefileContext*)
- *
  *  This function parses a particular branch of the tree
- *  @param tree pointer to the current LttvFilterTree
+ *  @param se pointer to the current LttvSimpleExpression
  *  @param event current LttEvent, NULL if not used
  *  @param tracefile current LttTracefile, NULL if not used
  *  @param trace current LttTrace, NULL if not used
@@ -1602,7 +1715,8 @@ lttv_filter_tree_parse(
  *  @param context current LttvTracefileContext, NULL if not used
  *  @return response of filter
  */
-gboolean lttv_filter_tree_parse_branch(
+gboolean 
+lttv_filter_tree_parse_branch(
         const LttvSimpleExpression* se,
         const LttEvent* event,
         const LttTracefile* tracefile,
@@ -1615,11 +1729,17 @@ gboolean lttv_filter_tree_parse_branch(
     switch(se->field) {
         case LTTV_FILTER_TRACE_NAME:
             if(trace == NULL) return TRUE;
-            else return se->op((gpointer)ltt_trace_name(trace),v);
+            else {
+                GQuark quark = ltt_trace_name(trace);
+                return se->op((gpointer)&quark,v);
+            }
             break;
         case LTTV_FILTER_TRACEFILE_NAME:
             if(tracefile == NULL) return TRUE;
-            else return se->op((gpointer)ltt_tracefile_name(tracefile),v);
+            else {
+                GQuark quark = ltt_tracefile_name(tracefile);
+                return se->op((gpointer)&quark,v);
+            }
             break;
         case LTTV_FILTER_STATE_PID:
             if(state == NULL) return TRUE;
@@ -1647,7 +1767,8 @@ gboolean lttv_filter_tree_parse_branch(
              */
             if(state == NULL) return TRUE;
             else {
-              return se->op((gpointer)g_quark_to_string(state->name),v);
+              GQuark quark = state->name;
+              return se->op((gpointer)&quark,v);
             }
             break;
         case LTTV_FILTER_STATE_EX_MODE:
@@ -1665,7 +1786,11 @@ gboolean lttv_filter_tree_parse_branch(
         case LTTV_FILTER_STATE_CPU:
             if(context == NULL) return TRUE;
             else {
-              return se->op((gpointer)g_quark_to_string(((LttvTracefileState*)context)->cpu_name),v);
+              /* FIXME: not sure of that one  Mathieu : fixed.*/
+ //             GQuark quark = ((LttvTracefileState*)context)->cpu_name;
+ //                return se->op((gpointer)&quark,v);
+              if(state == NULL) return TRUE;
+              else return se->op((gpointer)&state->cpu,v);
             }
             break;
         case LTTV_FILTER_EVENT_NAME:
@@ -1673,13 +1798,14 @@ gboolean lttv_filter_tree_parse_branch(
             else {
               LttEventType* et;
               et = ltt_event_eventtype(event);
-              return se->op((gpointer)ltt_eventtype_name(et),v);
+              GQuark quark = ltt_eventtype_name(et);
+              return se->op((gpointer)&quark,v);
             }
             break;
             
         case LTTV_FILTER_EVENT_CATEGORY:
             /*
-             * FIXME: Not yet implemented
+             * TODO: Not yet implemented
              */
             return TRUE;
             break;
@@ -1691,15 +1817,11 @@ gboolean lttv_filter_tree_parse_branch(
             }
             break;
         case LTTV_FILTER_EVENT_TSC:
-//          if(event == NULL) return TRUE;
-//          else {
-//            double val = ltt_time_to_double(event->event_time);
-//            return se->op((gpointer)&val,v);
-//          }
-            /*
-             * FIXME: Where is event.tsc
-             */
-            return TRUE;
+            if(event == NULL) return TRUE;
+            else {
+              LttCycleCount count = ltt_event_cycle_count(event);
+              return se->op((gpointer)&count,v);
+            }
             break;
         case LTTV_FILTER_EVENT_FIELD:
             /*
@@ -1726,27 +1848,32 @@ gboolean lttv_filter_tree_parse_branch(
 
 
 /**
- *  @fn void lttv_print_tree(LttvFilterTree*)
- *
- *  Debug
+ *  Debug function.  Prints tree memory allocation.
  *  @param t the pointer to the current LttvFilterTree
  */
 void
-lttv_print_tree(const LttvFilterTree* t) {
+lttv_print_tree(const LttvFilterTree* t, const int count) {
 
-  g_print("node:%p lchild:%p rchild:%p\n",t, //t->l_child.t,t->r_child.t);
+  g_print("node:%p lchild:%p rchild:%p depth:%i\n",t, //t->l_child.t,t->r_child.t);
           (t->left==LTTV_TREE_NODE)?t->l_child.t:NULL,
-          (t->right==LTTV_TREE_NODE)?t->r_child.t:NULL);
-  g_print("node type: %i / [left] %i / [right] %i\n",t->node,t->left,t->right);
-  if(t->left == LTTV_TREE_NODE) lttv_print_tree(t->l_child.t);
-  else if(t->left == LTTV_TREE_LEAF) {
-    g_print("%p: left is %i %p value\n",t,t->l_child.leaf->field,t->l_child.leaf->op);
+          (t->right==LTTV_TREE_NODE)?t->r_child.t:NULL,
+          count);
+  g_print("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE"))));
+  g_print("|-> left branch %p is a %s\n",t->l_child.t,(t->left==LTTV_TREE_NODE)?"NODE":((t->left==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
+  if(t->left == LTTV_TREE_LEAF) {
+    g_print("| |-> field type number: %i\n",t->l_child.leaf->field);
+    g_print("| |-> offset is: %i\n",t->l_child.leaf->offset);
+    g_print("| |-> operator function is: %p\n",t->l_child.leaf->op);
   }
-  if(t->right == LTTV_TREE_NODE) lttv_print_tree(t->r_child.t);
-  else if(t->right == LTTV_TREE_LEAF) {
-    g_print("%p: right is %i %p value\n",t,t->r_child.leaf->field,t->r_child.leaf->op);
+  g_print("|-> right branch %p is a %s\n",t->r_child.t,(t->right==LTTV_TREE_NODE)?"NODE":((t->right==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
+  if(t->right == LTTV_TREE_LEAF) {
+    g_print("| |-> field type number: %i\n",t->r_child.leaf->field);
+    g_print("| |-> offset is: %i\n",t->r_child.leaf->offset);
+    g_print("| |-> operator function is: %p\n",t->r_child.leaf->op);
   }
- 
+
+  if(t->left == LTTV_TREE_NODE) lttv_print_tree(t->l_child.t,count+1);
+  if(t->right == LTTV_TREE_NODE) lttv_print_tree(t->r_child.t,count+1);
 }
 
 /**
@@ -1760,7 +1887,7 @@ static void module_init()
 }
 
 /**
- *  @fn Destroys the filter module and specific values
+ *  Destroys the filter module and specific values
  */
 static void module_destroy() 
 {