create directories branches, tags, trunk
[lttv.git] / ltt / branches / poly / lttv / lttv / filter.c
index e5c9f9956174400c341b8510c24ba72423f7205b..f62755868f27f8958e4b13989556d2ef6effd5d1 100644 (file)
@@ -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
  * 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)
+ *  | |->facility (String, converted to GQuark)
+ *  | |->category (String, not yet implemented)
+ *  | |->time (LttTime)
+ *  | |->tsc (LttCycleCount --> uint64)
+ *  | |->target_pid (target PID of the event)
+ *  | |->fields
+ *  |   |->"facility_name
+ *  |     |->"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 (guint)
+ *    |->ppid (guint)
+ *    |->creation_time (LttTime)
+ *    |->insertion_time (LttTime)
+ *    |->process_name (String, converted to GQuark)
+ *    |->thread_brand (String, converted to GQuark)
+ *    |->execution_mode (LttvExecutionMode)
+ *    |->execution_submode (LttvExecutionSubmode)
+ *    |->process_status (LttvProcessStatus)
+ *    |->cpu (guint)
+ *  \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>
-
-/*
-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;
-*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-/**
- * @fn void lttv_filter_tree_add_node(GPtrArray*,LttvFilterTree*,LttvLogicalOp)
- * 
- * add a node to the current tree
- * FIXME: Might be used to lower coding in lttv_filter_new switch expression
- * @param stack the tree stack
- * @param subtree the subtree if available (pointer or NULL)
- * @param op the logical operator that will form the node
- */
-void
-lttv_filter_tree_add_node(GPtrArray* stack, LttvFilterTree* subtree, LttvLogicalOp op) {
-
-  LttvFilterTree* t1 = NULL;
-  LttvFilterTree* t2 = NULL;
-
-  t1 = (LttvFilterTree*)g_ptr_array_index(stack,stack->len-1);
-  while(t1->right != LTTV_TREE_IDLE) t1 = (LttvFilterTree*)t1->r_child.t;
-  t2 = lttv_filter_tree_new();
-  t2->node = op;
-  if(subtree != NULL) {
-    t2->left = LTTV_TREE_NODE;
-    t2->l_child.t = (LttvFilterTree*)subtree;
-    subtree = NULL;
-    t1->right = LTTV_TREE_NODE;
-    t1->r_child.t = t2;
-  } else {
-//  a_simple_expression->value = a_field_component->str;
-//    a_field_component = g_string_new("");
-    t2->left = LTTV_TREE_LEAF;
-//    t2->l_child.leaf = a_simple_expression;
-//  a_simple_expression = g_new(lttv_simple_expression,1);
-    t1->right = LTTV_TREE_NODE;
-    t1->r_child.t = t2; 
-  }
-  
-}
+//#define TEST
+#ifdef TEST
+#include <time.h>
+#include <sys/time.h>
+#endif
 
+#include <lttv/lttv.h>
+#include <lttv/filter.h>
+#include <ltt/trace.h>
+#include <stdlib.h>
+#include <string.h>
 
 /**
  * @fn LttvSimpleExpression* lttv_simple_expression_new()
@@ -133,13 +97,12 @@ lttv_simple_expression_new() {
   se->field = LTTV_FILTER_UNDEFINED;
   se->op = NULL;
   se->offset = 0;
-  se->value = NULL;
 
   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 
@@ -149,12 +112,12 @@ lttv_simple_expression_new() {
  *  @return success/failure of operation
  */
 gboolean
-lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
+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 
@@ -201,6 +164,7 @@ lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
      *  state.creation_time
      *  state.insertion_time
      *  state.process_name
+     *  state.thread_brand
      *  state.execution_mode
      *  state.execution_submode
      *  state.process_status
@@ -223,6 +187,9 @@ lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
     else if(!g_strcasecmp(f->str,"process_name") ) {
       se->field = LTTV_FILTER_STATE_P_NAME;
     }
+    else if(!g_strcasecmp(f->str,"thread_brand") ) {
+      se->field = LTTV_FILTER_STATE_T_BRAND;
+    }
     else if(!g_strcasecmp(f->str,"execution_mode") ) {
       se->field = LTTV_FILTER_STATE_EX_MODE;
     }
@@ -242,6 +209,8 @@ lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
      *  event.category
      *  event.time
      *  event.tsc
+     *  event.target_pid
+     *  event.field
      */
     g_string_free(f,TRUE);
     f=g_ptr_array_remove_index(fp,0);
@@ -260,10 +229,23 @@ lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
     else if(!g_strcasecmp(f->str,"tsc") ) {
       se->field = LTTV_FILTER_EVENT_TSC;
     }
-    else {  /* core.xml specified options */
+    else if(!g_strcasecmp(f->str,"target_pid") ) {
+      se->field = LTTV_FILTER_EVENT_TARGET_PID;
+    }
+    else if(!g_strcasecmp(f->str,"field") ) {
       se->field = LTTV_FILTER_EVENT_FIELD;
+      g_string_free(f,TRUE);
+      f=g_ptr_array_remove_index(fp,0);
+
+    } else {
+      g_string_free(f,TRUE);
+      f=g_ptr_array_remove_index(fp,0);
+      g_warning("Unknown event filter subtype %s", f->str);
     }
   } else {
+    g_string_free(f,TRUE);
+    f=g_ptr_array_remove_index(fp,0);
+
     g_warning("Unrecognized field in filter string");
   }
 
@@ -273,7 +255,6 @@ lttv_simple_expression_add_field(GPtrArray* fp, LttvSimpleExpression* se) {
   /* array should be empty */
   g_assert(fp->len == 0);
  
-  g_print("field: %i\n",se->field);
   if(se->field == LTTV_FILTER_UNDEFINED) {
     g_warning("The specified field was not recognized !");
     return FALSE;
@@ -287,15 +268,12 @@ lttv_simple_expression_add_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) {
      
-//  g_print("se->field = %i\n",se->field);
-//  g_print("se->offset = %i\n",se->offset);
-//  g_print("se->op = %p\n",se->op);
-//  g_print("se->value = %s\n",se->value);
-   
   switch(se->field) {
      /* 
       * string
@@ -303,13 +281,17 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
      case LTTV_FILTER_TRACE_NAME:
      case LTTV_FILTER_TRACEFILE_NAME:
      case LTTV_FILTER_STATE_P_NAME:
+     case LTTV_FILTER_STATE_T_BRAND:
      case LTTV_FILTER_EVENT_NAME:
+     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");
@@ -319,11 +301,7 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
      /* 
       * integer
       */
-     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;
@@ -348,31 +326,84 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
            return FALSE;
        }
        break;
+     /* 
+      * unsigned integers
+      */
+     case LTTV_FILTER_STATE_CPU:
+     case LTTV_FILTER_STATE_PID:
+     case LTTV_FILTER_STATE_PPID:
+     case LTTV_FILTER_EVENT_TARGET_PID:
+       switch(op) {
+         case LTTV_FIELD_EQ:
+           se->op = lttv_apply_op_eq_uint;
+           break;
+         case LTTV_FIELD_NE:
+           se->op = lttv_apply_op_ne_uint;
+           break;
+         case LTTV_FIELD_LT:
+           se->op = lttv_apply_op_lt_uint;
+           break;
+         case LTTV_FIELD_LE:
+           se->op = lttv_apply_op_le_uint;
+           break;
+         case LTTV_FIELD_GT:
+           se->op = lttv_apply_op_gt_uint;
+           break;
+         case LTTV_FIELD_GE:
+           se->op = lttv_apply_op_ge_uint;
+           break;
+         default:
+           g_warning("Error encountered in operator assignment");
+           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;
      /*
-      * double
+      * 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_double;
+           se->op = lttv_apply_op_eq_ltttime;
            break;
          case LTTV_FIELD_NE:
-           se->op = lttv_apply_op_ne_double;
+           se->op = lttv_apply_op_ne_ltttime;
            break;
          case LTTV_FIELD_LT:
-           se->op = lttv_apply_op_lt_double;
+           se->op = lttv_apply_op_lt_ltttime;
            break;
          case LTTV_FIELD_LE:
-           se->op = lttv_apply_op_le_double;
+           se->op = lttv_apply_op_le_ltttime;
            break;
          case LTTV_FIELD_GT:
-           se->op = lttv_apply_op_gt_double;
+           se->op = lttv_apply_op_gt_ltttime;
            break;
          case LTTV_FIELD_GE:
-           se->op = lttv_apply_op_ge_double;
+           se->op = lttv_apply_op_ge_ltttime;
            break;
          default:
            g_warning("Error encountered in operator assignment");
@@ -380,7 +411,7 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
        }
        break;
      default:
-       g_warning("Error encountered in operator assignment ! Bad field type ...");
+       g_warning("Error encountered in operator assignation ! Field type:%i",se->field);
        return FALSE;
    }
   
@@ -388,17 +419,120 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx
 
 }
 
+/**
+ *  @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) {
+
+  unsigned i;
+  gboolean is_double = FALSE;
+  LttTime t = ltt_time_zero;
+  GString* v;
+  guint string_len;
+  
+  switch(se->field) {
+     /* 
+      * 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_STATE_T_BRAND:
+     case LTTV_FILTER_EVENT_NAME:
+     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_quark = g_quark_from_string(value);
+       g_free(value);
+       break;
+     /* 
+      * integer -- supposed to be uint64
+      */
+     case LTTV_FILTER_EVENT_TSC:
+       se->value.v_uint64 = atoi(value);
+       g_free(value);
+       break;
+     /*
+      * unsigned integers
+      */
+     case LTTV_FILTER_STATE_PID:
+     case LTTV_FILTER_STATE_PPID:
+     case LTTV_FILTER_STATE_CPU:
+     case LTTV_FILTER_EVENT_TARGET_PID:
+       se->value.v_uint = atoi(value);
+       g_free(value);
+       break;
+     /*
+      * LttTime
+      */
+     case LTTV_FILTER_STATE_CT:
+     case LTTV_FILTER_STATE_IT:
+     case LTTV_FILTER_EVENT_TIME:
+       //se->value.v_double = atof(value);
+       /*
+        * parsing logic could be optimised,
+        * but as for now, simpler this way
+        */
+       v = g_string_new("");
+       string_len = strlen(value);
+       for(i=0;i<string_len;i++) {
+          if(value[i] == '.') { 
+              /* cannot specify number with more than one '.' */
+              if(is_double) return FALSE; 
+              else is_double = TRUE;
+              t.tv_sec = atoi(v->str);
+              g_string_free(v,TRUE);
+              v = g_string_new("");
+          } else v = g_string_append_c(v,value[i]);
+       }
+       /* number can be integer or double */
+       if(is_double) t.tv_nsec = atoi(v->str);
+       else {
+         t.tv_sec = atoi(v->str);
+         t.tv_nsec = 0;
+       }
+       
+       g_string_free(v,TRUE);
+       
+       se->value.v_ltttime = t;
+       g_free(value);
+       break;
+     default:
+       g_warning("Error encountered in value assignation ! Field type = %i",se->field);
+       g_free(value);
+       return FALSE;
+   }
+  
+  return TRUE;
+  
+}
+
 /**
  *  @fn void lttv_simple_expression_destroy(LttvSimpleExpression*)
  *
- *  Desallocate memory for the current 
+ *  Disallocate memory for the current 
  *  simple expression
  *  @param se pointer to the current LttvSimpleExpression
  */
 void
 lttv_simple_expression_destroy(LttvSimpleExpression* se) {
   
-  g_free(se->value);
+ // 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;
+//  }
   g_free(se);
 
 }
@@ -426,6 +560,7 @@ lttv_struct_type(gint ft) {
         case LTTV_FILTER_STATE_CT:
         case LTTV_FILTER_STATE_IT:
         case LTTV_FILTER_STATE_P_NAME:
+  case LTTV_FILTER_STATE_T_BRAND:
         case LTTV_FILTER_STATE_EX_MODE:
         case LTTV_FILTER_STATE_EX_SUBMODE:
         case LTTV_FILTER_STATE_P_STATUS:
@@ -436,6 +571,7 @@ lttv_struct_type(gint ft) {
         case LTTV_FILTER_EVENT_CATEGORY:
         case LTTV_FILTER_EVENT_TIME:
         case LTTV_FILTER_EVENT_TSC:
+        case LTTV_FILTER_EVENT_TARGET_PID:
         case LTTV_FILTER_EVENT_FIELD:
             return LTTV_FILTER_EVENT;
             break;
@@ -444,6 +580,22 @@ lttv_struct_type(gint ft) {
     }
 }
 
+/**
+ *  @fn gboolean lttv_apply_op_eq_uint(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_uint(const gpointer v1, LttvFieldValue v2) {
+
+  guint* r = (guint*) v1;
+  return (*r == v2.v_uint);
+  
+}
+
 /**
  *  @fn gboolean lttv_apply_op_eq_uint64(gpointer,LttvFieldValue) 
  * 
@@ -453,11 +605,10 @@ lttv_struct_type(gint ft) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_eq_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_eq_uint64(const gpointer v1, LttvFieldValue v2) {
 
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r == l);
+  return (*r == v2.v_uint64);
   
 }
 
@@ -470,10 +621,9 @@ gboolean lttv_apply_op_eq_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_eq_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_eq_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r == l);
+  return (*r == v2.v_uint32);
 }
 
 /**
@@ -485,10 +635,9 @@ gboolean lttv_apply_op_eq_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_eq_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_eq_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r == l);
+  return (*r == v2.v_uint16);
 }
 
 /**
@@ -500,10 +649,9 @@ gboolean lttv_apply_op_eq_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_eq_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_eq_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r == l);
+  return (*r == v2.v_double);
 }
 
 /**
@@ -515,9 +663,51 @@ gboolean lttv_apply_op_eq_double(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_eq_string(gpointer v1, char* v2) {
+gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) {
   char* r = (char*) v1;
-  return (!g_strcasecmp(r,v2));
+  return (!g_strcasecmp(r,v2.v_string));
+}
+
+/**
+ *  @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;
+  return (*r == v2.v_quark);
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_eq_ltttime(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_ltttime(const gpointer v1, LttvFieldValue v2) {
+  LttTime* r = (LttTime*) v1;
+  return ltt_time_compare(*r, v2.v_ltttime)==0?1:0;
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_ne_uint(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_uint(const gpointer v1, LttvFieldValue v2) {
+  guint* r = (guint*) v1;
+  return (*r != v2.v_uint);
 }
 
 /**
@@ -529,10 +719,9 @@ gboolean lttv_apply_op_eq_string(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ne_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ne_uint64(const gpointer v1, LttvFieldValue v2) {
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r != l);
+  return (*r != v2.v_uint64);
 }
 
 /**
@@ -544,10 +733,9 @@ gboolean lttv_apply_op_ne_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ne_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ne_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r != l);
+  return (*r != v2.v_uint32);
 }
 
 /**
@@ -559,10 +747,9 @@ gboolean lttv_apply_op_ne_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ne_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ne_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r != l);
+  return (*r != v2.v_uint16);
 }
 
 /**
@@ -574,10 +761,9 @@ gboolean lttv_apply_op_ne_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ne_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ne_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r != l);
+  return (*r != v2.v_double);
 }
 
 /**
@@ -589,9 +775,52 @@ gboolean lttv_apply_op_ne_double(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ne_string(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ne_string(const gpointer v1, LttvFieldValue v2) {
   char* r = (char*) v1;
-  return (g_strcasecmp(r,v2));
+  return (g_strcasecmp(r,v2.v_string));
+}
+
+/**
+ *  @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_quark);
+}
+
+
+/**
+ *  @fn gboolean lttv_apply_op_ne_ltttime(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_ltttime(const gpointer v1, LttvFieldValue v2) {
+  LttTime* r = (LttTime*) v1;
+  return ltt_time_compare(*r, v2.v_ltttime)!=0?1:0;
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_lt_uint(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'lower than' 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_lt_uint(const gpointer v1, LttvFieldValue v2) {
+  guint* r = (guint*) v1;
+  return (*r < v2.v_uint);
 }
 
 /**
@@ -603,10 +832,9 @@ gboolean lttv_apply_op_ne_string(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_lt_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_lt_uint64(const gpointer v1, LttvFieldValue v2) {
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r < l);
+  return (*r < v2.v_uint64);
 }
 
 /**
@@ -618,10 +846,9 @@ gboolean lttv_apply_op_lt_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_lt_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_lt_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r < l);
+  return (*r < v2.v_uint32);
 }
 
 /**
@@ -633,10 +860,9 @@ gboolean lttv_apply_op_lt_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_lt_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_lt_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r < l);
+  return (*r < v2.v_uint16);
 }
 
 /**
@@ -648,10 +874,38 @@ gboolean lttv_apply_op_lt_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_lt_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_lt_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r < l);
+  return (*r < v2.v_double);
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_lt_ltttime(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'lower than' 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_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 ltt_time_compare(*r, v2.v_ltttime)==-1?1:0;
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_le_uint(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'lower or 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_le_uint(const gpointer v1, LttvFieldValue v2) {
+  guint* r = (guint*) v1;
+  return (*r <= v2.v_uint);
 }
 
 /**
@@ -663,10 +917,9 @@ gboolean lttv_apply_op_lt_double(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_le_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_le_uint64(const gpointer v1, LttvFieldValue v2) {
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r <= l);
+  return (*r <= v2.v_uint64);
 }
 
 /**
@@ -678,10 +931,9 @@ gboolean lttv_apply_op_le_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_le_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_le_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r <= l);
+  return (*r <= v2.v_uint32);
 }
 
 /**
@@ -693,10 +945,9 @@ gboolean lttv_apply_op_le_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_le_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_le_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r <= l);
+  return (*r <= v2.v_uint16);
 }
 
 /**
@@ -708,10 +959,39 @@ gboolean lttv_apply_op_le_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_le_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_le_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r <= l);
+  return (*r <= v2.v_double);
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_le_ltttime(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'lower or 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_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 ltt_time_compare(*r, v2.v_ltttime)<1?1:0;
+}
+
+
+/**
+ *  @fn gboolean lttv_apply_op_gt_uint(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'greater than' 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_gt_uint(const gpointer v1, LttvFieldValue v2) {
+  guint* r = (guint*) v1;
+  return (*r > v2.v_uint);
 }
 
 /**
@@ -723,10 +1003,9 @@ gboolean lttv_apply_op_le_double(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_gt_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_gt_uint64(const gpointer v1, LttvFieldValue v2) {
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r > l);
+  return (*r > v2.v_uint64);
 }
 
 /**
@@ -738,10 +1017,9 @@ gboolean lttv_apply_op_gt_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_gt_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_gt_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r > l);
+  return (*r > v2.v_uint32);
 }
 
 /**
@@ -753,10 +1031,9 @@ gboolean lttv_apply_op_gt_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_gt_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_gt_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r > l);
+  return (*r > v2.v_uint16);
 }
 
 /**
@@ -768,10 +1045,38 @@ gboolean lttv_apply_op_gt_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_gt_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_gt_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r > l);
+  return (*r > v2.v_double);
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_gt_ltttime(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'greater than' 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_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 ltt_time_compare(*r, v2.v_ltttime)==1?1:0;
+}
+
+/**
+ *  @fn gboolean lttv_apply_op_ge_uint(gpointer,LttvFieldValue) 
+ * 
+ *  Applies the 'greater or 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_ge_uint(const gpointer v1, LttvFieldValue v2) {
+  guint* r = (guint*) v1;
+  return (*r >= v2.v_uint);
 }
 
 /**
@@ -783,10 +1088,9 @@ gboolean lttv_apply_op_gt_double(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ge_uint64(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ge_uint64(const gpointer v1, LttvFieldValue v2) {
   guint64* r = (guint64*) v1;
-  guint64 l = atoi(v2);
-  return (*r >= l);
+  return (*r >= v2.v_uint64);
 }
 
 /**
@@ -798,10 +1102,9 @@ gboolean lttv_apply_op_ge_uint64(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ge_uint32(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ge_uint32(const gpointer v1, LttvFieldValue v2) {
   guint32* r = (guint32*) v1;
-  guint32 l = atoi(v2);
-  return (*r >= l);
+  return (*r >= v2.v_uint32);
 }
 
 /**
@@ -813,14 +1116,13 @@ gboolean lttv_apply_op_ge_uint32(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ge_uint16(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ge_uint16(const gpointer v1, LttvFieldValue v2) {
   guint16* r = (guint16*) v1;
-  guint16 l = atoi(v2);
-  return (*r >= l);
+  return (*r >= v2.v_uint16);
 }
 
 /**
 *  @fn gboolean lttv_apply_op_ge_double(gpointer,LttvFieldValue) 
+ *  @fn gboolean lttv_apply_op_ge_double(gpointer,LttvFieldValue) 
  * 
  *  Applies the 'greater or equal' operator to the
  *  specified structure and value 
@@ -828,22 +1130,35 @@ gboolean lttv_apply_op_ge_uint16(gpointer v1, char* v2) {
  *  @param v2 right member of comparison
  *  @return success/failure of operation
  */
-gboolean lttv_apply_op_ge_double(gpointer v1, char* v2) {
+gboolean lttv_apply_op_ge_double(const gpointer v1, LttvFieldValue v2) {
   double* r = (double*) v1;
-  double l = atof(v2);
-  return (*r >= l);
+  return (*r >= v2.v_double);
 }
 
-
 /**
- *  @fn LttvFilterTree* lttv_filter_tree_clone(LttvFilterTree*)
+ *  @fn gboolean lttv_apply_op_ge_ltttime(gpointer,LttvFieldValue) 
  * 
+ *  Applies the 'greater or 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_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 ltt_time_compare(*r, v2.v_ltttime)>-1?1:0;
+}
+
+
+
+/**
  *  Makes a copy of the current filter tree
  *  @param tree pointer to the current tree
  *  @return new copy of the filter tree
  */
 LttvFilterTree*
-lttv_filter_tree_clone(LttvFilterTree* tree) {
+lttv_filter_tree_clone(const LttvFilterTree* tree) {
 
   LttvFilterTree* newtree = lttv_filter_tree_new();  
 
@@ -857,7 +1172,8 @@ lttv_filter_tree_clone(LttvFilterTree* tree) {
     newtree->l_child.leaf->field = tree->l_child.leaf->field;
     newtree->l_child.leaf->offset = tree->l_child.leaf->offset;
     newtree->l_child.leaf->op = tree->l_child.leaf->op;
-    newtree->l_child.leaf->value = g_strconcat(tree->l_child.leaf->value);
+    /* FIXME: special case for string copy ! */
+    newtree->l_child.leaf->value = tree->l_child.leaf->value;
   }
  
   newtree->right = tree->right;
@@ -868,7 +1184,7 @@ lttv_filter_tree_clone(LttvFilterTree* tree) {
     newtree->r_child.leaf->field = tree->r_child.leaf->field;
     newtree->r_child.leaf->offset = tree->r_child.leaf->offset;
     newtree->r_child.leaf->op = tree->r_child.leaf->op;
-    newtree->r_child.leaf->value = g_strconcat(tree->r_child.leaf->value);
+    newtree->r_child.leaf->value = tree->r_child.leaf->value;
   }
   
   return newtree;
@@ -876,19 +1192,17 @@ lttv_filter_tree_clone(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(LttvFilter* filter) {
+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);
@@ -901,10 +1215,8 @@ lttv_filter_clone(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() {
@@ -912,6 +1224,8 @@ lttv_filter_new() {
   LttvFilter* filter = g_new(LttvFilter,1);
   filter->expression = NULL;
   filter->head = NULL;
+
+  return filter;
     
 }
 
@@ -926,20 +1240,23 @@ lttv_filter_new() {
 gboolean
 lttv_filter_update(LttvFilter* filter) {
     
-  g_print("filter::lttv_filter_new()\n");              /* debug */
+//  g_print("filter::lttv_filter_new()\n");    /* debug */
   
   if(filter->expression == NULL) return FALSE;
   
-  unsigned     
+  int  
     i, 
-    p_nesting=0;       /* parenthesis nesting value */
-
+    p_nesting=0,  /* parenthesis nesting value */
+    not=0;
+  guint expression_len;
+    
   /* 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
@@ -947,7 +1264,7 @@ lttv_filter_update(LttvFilter* filter) {
    * destroy it and build a new one
    */
   if(filter->head != NULL) lttv_filter_tree_destroy(filter->head);
-  filter->head = tree;
+  filter->head = NULL;    /* will be assigned at the end */
  
   /*
    * Tree Stack
@@ -963,23 +1280,26 @@ lttv_filter_update(LttvFilter* filter) {
   
   /* temporary values */
   GString *a_field_component = g_string_new(""); 
+  GString *a_string_spaces = g_string_new(""); 
   GPtrArray *a_field_path = g_ptr_array_new(); 
   
   /* simple expression buffer */
   LttvSimpleExpression* a_simple_expression = lttv_simple_expression_new(); 
+
+  gint nest_quotes = 0;
   
   /*
-   *   Parse entire expression and construct
-   *   the binary tree.  There are two steps 
-   *   in browsing that string
-   *     1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} "
-   *     2. finding simple expressions
-   *       - field path ( separated by dots )
-   *       - op ( >, <, =, >=, <=, !=)
-   *       - value ( integer, string ... )
-   *   To spare computing time, the whole 
-   *   string is parsed in this loop for a 
-   *   O(n) complexity order.
+   *  Parse entire expression and construct
+   *  the binary tree.  There are two steps 
+   *  in browsing that string
+   *    1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} "
+   *    2. finding simple expressions
+   *      - field path ( separated by dots )
+   *      - op ( >, <, =, >=, <=, !=)
+   *      - value ( integer, string ... )
+   *  To spare computing time, the whole 
+   *  string is parsed in this loop for a 
+   *  O(n) complexity order.
    *
    *  When encountering logical op &,|,^
    *    1. parse the last value if any
@@ -998,82 +1318,145 @@ 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
   
-  g_print("expression: %s\n",filter->expression);
-  g_print("strlen(expression): %i\n",strlen(filter->expression));
-  for(i=0;i<strlen(filter->expression);i++) {
+  expression_len = strlen(filter->expression);
+  for(i=0;i<expression_len;i++) {
     // debug
-    g_print("%c ",filter->expression[i]);
+//    g_print("%c\n ",filter->expression[i]);
+    if(nest_quotes) {
+      switch(filter->expression[i]) {
+        case '\\' :
+          if(filter->expression[i+1] == '\"') {
+            i++;
+          }
+          break;
+        case '\"':
+          nest_quotes = 0;
+          i++;
+          break;
+      }
+      if(a_string_spaces->len != 0) {
+        a_field_component = g_string_append(
+          a_field_component, a_string_spaces->str);
+        a_string_spaces = g_string_set_size(a_string_spaces, 0);
+      }
+      a_field_component = g_string_append_c(a_field_component,
+        filter->expression[i]);
+      continue;
+    }
+
     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);
-        while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
+
+        /* 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 */
-          a_simple_expression->value = g_string_free(a_field_component,FALSE);
+          lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = 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;
       
       case '|':   /* or */
       
-        t1 = (LttvFilter*)g_ptr_array_index(tree_stack,tree_stack->len-1);
-        while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
+        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_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 */
-          a_simple_expression->value = g_string_free(a_field_component,FALSE);
+       } 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("");
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = 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;
       
       case '^':   /* xor */
         
-        t1 = (LttvFilter*)g_ptr_array_index(tree_stack,tree_stack->len-1);
-        while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
+        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_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 */
-          a_simple_expression->value = g_string_free(a_field_component,FALSE);
+          lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
           a_field_component = g_string_new("");
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = 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;
       
@@ -1081,17 +1464,14 @@ lttv_filter_update(LttvFilter* filter) {
         
         if(filter->expression[i+1] == '=') {  /* != */
           g_ptr_array_add( a_field_path,(gpointer) a_field_component );
-          lttv_simple_expression_add_field(a_field_path,a_simple_expression);
+          lttv_simple_expression_assign_field(a_field_path,a_simple_expression);
           a_field_component = g_string_new("");         
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = g_string_new("");
           lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_NE);
           i++;
         } else {  /* ! */
-          t1 = (LttvFilter*)g_ptr_array_index(tree_stack,tree_stack->len-1);
-          while(t1->right != LTTV_TREE_IDLE) 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;
       
@@ -1101,6 +1481,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;
       
@@ -1111,45 +1498,53 @@ lttv_filter_update(LttvFilter* filter) {
         p_nesting--;      /* decrementing parenthesis nesting value */
         if(p_nesting<0 || tree_stack->len<2) {
           g_warning("Wrong filtering options, the string\n\"%s\"\n\
-                     is not valid due to parenthesis incorrect use",filter->expression);       
+                     is not valid due to parenthesis incorrect use",filter->expression);  
           return FALSE;
         }
   
         /* 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 && t1->right != LTTV_TREE_LEAF) {
-              g_assert(t1!=NULL && t1->r_child.t != NULL);
-              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);
           g_ptr_array_remove_index(tree_stack,tree_stack->len-1);
         } else {    /* assign subtree as current tree */
-          a_simple_expression->value = g_string_free(a_field_component,FALSE);
+          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) t1 = t1->r_child.t;
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = g_string_new("");
           t1->right = LTTV_TREE_LEAF;
           t1->r_child.leaf = a_simple_expression;
           a_simple_expression = lttv_simple_expression_new(); 
-          subtree = g_ptr_array_index(tree_stack,tree_stack->len-1);
-          g_assert(subtree != NULL);
-          g_ptr_array_remove_index(tree_stack,tree_stack->len-1);
+          subtree = g_ptr_array_remove_index(tree_stack,tree_stack->len-1);
         }
         break;
 
-      /*       
-       *       mathematic operators
+      /*  
+       *  mathematic operators
        */
       case '<':   /* lower, lower or equal */
         
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );
-        lttv_simple_expression_add_field(a_field_path,a_simple_expression);
+        lttv_simple_expression_assign_field(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
+        g_string_free(a_string_spaces, TRUE);
+        a_string_spaces = g_string_new("");
         if(filter->expression[i+1] == '=') { /* <= */
           i++;
           lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_LE);
@@ -1159,8 +1554,10 @@ lttv_filter_update(LttvFilter* filter) {
       case '>':   /* higher, higher or equal */
         
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );   
-        lttv_simple_expression_add_field(a_field_path,a_simple_expression);
+        lttv_simple_expression_assign_field(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
+        g_string_free(a_string_spaces, TRUE);
+        a_string_spaces = g_string_new("");
         if(filter->expression[i+1] == '=') {  /* >= */
           i++;
           lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_GE);
@@ -1170,8 +1567,10 @@ lttv_filter_update(LttvFilter* filter) {
       case '=':   /* equal */
         
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );
-        lttv_simple_expression_add_field(a_field_path,a_simple_expression);
+        lttv_simple_expression_assign_field(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
+        g_string_free(a_string_spaces, TRUE);
+        a_string_spaces = g_string_new("");
         lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_EQ);
         break;
         
@@ -1183,48 +1582,79 @@ lttv_filter_update(LttvFilter* filter) {
         /*
          * divide field expression into elements 
          * in a_field_path array.
+         *
+         * A dot can also be present in double values
          */
-        /* FIXME: check for double values */
-//        if(a_simple_expression->op == NULL) {
+        if(a_simple_expression->field == LTTV_FILTER_UNDEFINED) {
           g_ptr_array_add( a_field_path,(gpointer) a_field_component );
           a_field_component = g_string_new("");
-//        }
+          g_string_free(a_string_spaces, TRUE);
+          a_string_spaces = g_string_new("");
+        } else {
+          /* Operator found, we are in the value field */
+          g_string_append_c(a_field_component, filter->expression[i]);
+        }
         break;
-//    case ' ':
-//    case '\n':
-//      ignore
+      case ' ':   /* keep spaces that are within a field component */
+        if(a_field_component->len == 0) break; /* ignore */
+        else 
+          a_string_spaces = g_string_append_c(a_string_spaces,
+                                              filter->expression[i]);
+
+      case '\n':  /* ignore */
+        break;
+      case '\"':
+               nest_quotes?(nest_quotes=0):(nest_quotes=1);
+               break;
       default:    /* concatening current string */
-        g_string_append_c(a_field_component,filter->expression[i]);
+              if(a_string_spaces->len != 0) {
+                a_field_component = g_string_append(
+                    a_field_component, a_string_spaces->str);
+                a_string_spaces = g_string_set_size(a_string_spaces, 0);
+              }
+              a_field_component = g_string_append_c(a_field_component,
+                    filter->expression[i]);
     }
   }
 
-  g_print("subtree:%p, tree:%p, t1:%p, t2:%p\n",subtree,tree,t1,t2);
-  g_print("stack size: %i\n",tree_stack->len);
-
   /*
    * Preliminary check to see
    * if tree was constructed correctly
    */
   if( p_nesting>0 ) { 
     g_warning("Wrong filtering options, the string\n\"%s\"\n\
-        is not valid due to parenthesis incorrect use",filter->expression);    
+        is not valid due to parenthesis incorrect use",filter->expression);  
     return FALSE;
   }
  
   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) t1 = t1->r_child.t;
+  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 */
-    g_print("there right!\n");
     t1->right = LTTV_TREE_NODE;
     t1->r_child.t = subtree;
     subtree = NULL;
   } else {  /* add a leaf */
-    a_simple_expression->value = g_string_free(a_field_component,FALSE);
+    lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); 
     a_field_component = NULL;
+    g_string_free(a_string_spaces, TRUE);
+    a_string_spaces = NULL;
     t1->right = LTTV_TREE_LEAF;
     t1->r_child.leaf = a_simple_expression;
     a_simple_expression = NULL;
@@ -1236,21 +1666,33 @@ lttv_filter_update(LttvFilter* filter) {
   g_ptr_array_free(a_field_path,TRUE);
 
   /* free the tree stack -- but keep the root tree */
-  g_ptr_array_free(tree_stack,FALSE);
-
+  filter->head = g_ptr_array_remove_index(tree_stack,0);
+  g_ptr_array_free(tree_stack,TRUE);
+  
   /* free the field buffer if allocated */
   if(a_field_component != NULL) g_string_free(a_field_component,TRUE); 
+   if(a_string_spaces != NULL) g_string_free(a_string_spaces, TRUE);
+
   /* free the simple expression buffer if allocated */
   if(a_simple_expression != NULL) lttv_simple_expression_destroy(a_simple_expression);
   
-  g_assert(tree != NULL); /* tree should exist */
+  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) ;
-  g_print("+++++++++++++++ END PRINT ++++++++++++++++++\n");
+  g_debug("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n");
+  lttv_print_tree(filter->head,0) ;
+  g_debug("+++++++++++++++ END PRINT ++++++++++++++++++\n");
   
   /* success */
   return TRUE;
@@ -1266,14 +1708,18 @@ 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);
   
 }
 
 /**
- *  LttvFilterTree* lttv_filter_tree_new()
+ *  @fn LttvFilterTree* lttv_filter_tree_new()
  * 
  *  Assign a new tree for the current expression
  *  or sub expression
@@ -1283,11 +1729,13 @@ LttvFilterTree*
 lttv_filter_tree_new() {
   LttvFilterTree* tree;
 
-  tree = g_new(LttvFilter,1);
+  tree = g_new(LttvFilterTree,1);
   tree->node = 0; //g_new(lttv_expression,1);
   tree->left = LTTV_TREE_IDLE;
   tree->right = LTTV_TREE_IDLE;
-
+  tree->r_child.t = NULL;
+  tree->l_child.t = NULL;
+  
   return tree;
 }
 
@@ -1300,18 +1748,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);
-  }
+  if(filter == NULL) return FALSE;
+  if(expression[0] == '\0') return FALSE;  /* Empty expression */
 
+  GString* s = g_string_new("");
+  if(filter->expression != NULL) {
+    s = g_string_append(s,filter->expression);
+    s = g_string_append_c(s,'&');
+  }
+  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);
   
 }
@@ -1323,7 +1777,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);
@@ -1349,28 +1804,30 @@ lttv_filter_tree_destroy(LttvFilterTree* tree) {
   if(tree->right == LTTV_TREE_LEAF) lttv_simple_expression_destroy(tree->r_child.leaf);
   else if(tree->right == LTTV_TREE_NODE) lttv_filter_tree_destroy(tree->r_child.t);
 
-  g_free(tree->node);
+//  g_free(tree->node);
   g_free(tree);
 }
 
 /**
- *  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
  *  @param state current LttvProcessState, NULL if not used
+ *  @param context current LttvTracefileContext, NULL if not used
+ *  @return response of filter
  */
 gboolean
 lttv_filter_tree_parse(
-        LttvFilterTree* t,
-        LttEvent* event,
-        LttTracefile* tracefile,
-        LttTrace* trace,
-        LttvProcessState* state
+        const LttvFilterTree* t,
+        const LttEvent* event,
+        const LttTracefile* tracefile,
+        const LttTrace* trace,
+        const LttvTracefileContext* context,
+       const LttvProcessState* state,
+       const LttvTraceContext* tc
         /*,...*/) 
 {
 
@@ -1408,122 +1865,32 @@ lttv_filter_tree_parse(
    *     -Result of left branch will not affect exploration of 
    *      right branch
    */
-  g_print("filter::lttv_parse_tree(...)\n");
     
   gboolean lresult = FALSE, rresult = FALSE;
+
+  LttvTraceState *ts;
+  LttvTracefileState *tfs = (LttvTracefileState*)context;
+  if(tc)
+    ts = (LttvTraceState*)tc;
+  else if(context)
+    ts = (LttvTraceState*)context->t_context;
+
+  if(tfs) {
+    guint cpu = tfs->cpu;
+    if(ts)
+      state = ts->running_process[cpu];
+  }
   
   /*
    * Parse left branch
    */
-  if(t->left == LTTV_TREE_NODE) lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,state);
+  if(t->left == LTTV_TREE_NODE) {
+      lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,context,NULL,NULL);
+  }
   else if(t->left == LTTV_TREE_LEAF) {
-    //g_print("%p: left is %i %p %s\n",t,t->l_child.leaf->field,t->l_child.leaf->op,t->l_child.leaf->value);
-    char* v;
-    g_assert(v = t->l_child.leaf->value);
-    switch(t->l_child.leaf->field) {
-        
-        case LTTV_FILTER_TRACE_NAME:
-            if(trace == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)ltt_trace_name(trace),v);
-            break;
-        case LTTV_FILTER_TRACEFILE_NAME:
-            if(tracefile == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)ltt_tracefile_name(tracefile),v);
-            break;
-        case LTTV_FILTER_STATE_PID:
-            if(state == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)&state->pid,v);
-            break;
-        case LTTV_FILTER_STATE_PPID:
-            if(state == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)&state->ppid,v);
-            break;
-        case LTTV_FILTER_STATE_CT:
-            if(state == NULL) lresult = TRUE;
-            else {
-              double val = ltt_time_to_double(state->creation_time);
-              lresult = t->l_child.leaf->op((gpointer)&val,v);
-            }
-            break;
-        case LTTV_FILTER_STATE_IT:
-            if(state == NULL) lresult = TRUE;
-            else {
-              double val = ltt_time_to_double(state->insertion_time);
-              lresult = t->l_child.leaf->op((gpointer)&val,v);
-            }
-            break;
-        case LTTV_FILTER_STATE_P_NAME:
-            /*
-             * FIXME: Yet to be done ( I think ? )
-             */
-            lresult = TRUE;
-            break;
-        case LTTV_FILTER_STATE_EX_MODE:
-            if(state == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)&state->state->t,v);
-            break;
-        case LTTV_FILTER_STATE_EX_SUBMODE:
-            if(state == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)&state->state->n,v);
-            break;
-        case LTTV_FILTER_STATE_P_STATUS:
-            if(state == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)&state->state->s,v);
-            break;
-        case LTTV_FILTER_STATE_CPU:
-            /*
-             * FIXME: What is the comparison value ?
-             */
-            lresult = TRUE;
-            break;
-        case LTTV_FILTER_EVENT_NAME:
-            if(event == NULL) lresult = TRUE;
-            else lresult = t->l_child.leaf->op((gpointer)ltt_event_eventtype(event),v);
-            break;
-            
-        case LTTV_FILTER_EVENT_CATEGORY:
-            /*
-             * FIXME: Not yet implemented
-             */
-            lresult = TRUE;
-            break;
-        case LTTV_FILTER_EVENT_TIME:
-//            if(event == NULL) lresult = TRUE;
-//            else {
-//                double val = ltt_time_to_double(event->event_time);
-//                lresult = t->l_child.leaf->op((gpointer)&val,v);
-//            }
-            lresult = TRUE;
-            break;
-        case LTTV_FILTER_EVENT_TSC:
-//          if(event == NULL) lresult = TRUE;
-//          else {
-//            double val = ltt_time_to_double(event->event_time);
-//            lresult = t->l_child.leaf->op((gpointer)&val,v);
-//          }
-            /*
-             * FIXME: Where is event.tsc
-             */
-            lresult = TRUE;
-            break;
-        case LTTV_FILTER_EVENT_FIELD:
-            /*
-             * TODO: Use the offset to 
-             * find the dynamic field 
-             * in the event struct
-             */
-            lresult = TRUE; 
-        default:
-            /*
-             * This case should never be 
-             * parsed, if so, the whole 
-             * filtering is cancelled
-             */
-            g_warning("Error while parsing the filter tree");
-            return TRUE;
-    }
+      lresult = lttv_filter_tree_parse_branch(t->l_child.leaf,event,tracefile,trace,state,context);
   }
+   
   /*
    * Parse linking operator
    * make a cutoff if possible
@@ -1534,96 +1901,162 @@ lttv_filter_tree_parse(
   /*
    * Parse right branch
    */
-  if(t->right == LTTV_TREE_NODE) rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,state);
+  if(t->right == LTTV_TREE_NODE) {
+      rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,context,NULL,NULL);
+  }
   else if(t->right == LTTV_TREE_LEAF) {
-    //g_print("%p: right is %i %p %s\n",t,t->r_child.leaf->field,t->r_child.leaf->op,t->r_child.leaf->value);
-    char* v;
-    g_assert(v = t->r_child.leaf->value);
-    switch(t->r_child.leaf->field) {
-        
+      rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context);
+  }
+
+  
+  /*
+   * Apply and return the 
+   * logical link between the 
+   * two operation
+   */
+  switch(t->node) {
+    case LTTV_LOGICAL_OR: return (lresult | rresult);
+    case LTTV_LOGICAL_AND: return (lresult & 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: 
+      /*
+       * This case should never be 
+       * parsed, if so, this subtree
+       * is cancelled !
+       */
+      return TRUE;
+  }
+  
+}
+
+/**
+ *  This function parses a particular branch of the tree
+ *  @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
+ *  @param state current LttvProcessState, NULL if not used
+ *  @param context current LttvTracefileContext, NULL if not used
+ *  @return response of filter
+ */
+gboolean 
+lttv_filter_tree_parse_branch(
+        const LttvSimpleExpression* se,
+        const LttEvent* event,
+        const LttTracefile* tracefile,
+        const LttTrace* trace,
+        const LttvProcessState* state,
+        const LttvTracefileContext* context) {
+
+    LttvFieldValue v;
+    v = se->value;
+    switch(se->field) {
         case LTTV_FILTER_TRACE_NAME:
-            if(trace == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)ltt_trace_name(trace),v);
+            if(trace == NULL) return TRUE;
+            else {
+                GQuark quark = ltt_trace_name(trace);
+                return se->op((gpointer)&quark,v);
+            }
             break;
         case LTTV_FILTER_TRACEFILE_NAME:
-            if(tracefile == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)ltt_tracefile_name(tracefile),v);
+            if(tracefile == NULL) return TRUE;
+            else {
+                GQuark quark = ltt_tracefile_name(tracefile);
+                return se->op((gpointer)&quark,v);
+            }
             break;
         case LTTV_FILTER_STATE_PID:
-            if(state == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)&state->pid,v);
+            if(state == NULL) return TRUE;
+            else return se->op((gpointer)&state->pid,v);
             break;
         case LTTV_FILTER_STATE_PPID:
-            if(state == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)&state->ppid,v);
+            if(state == NULL) return TRUE;
+            else return se->op((gpointer)&state->ppid,v);
             break;
         case LTTV_FILTER_STATE_CT:
-            if(state == NULL) rresult = TRUE;
+            if(state == NULL) return TRUE;
             else {
-              double val = ltt_time_to_double(state->creation_time);
-              rresult = t->r_child.leaf->op((gpointer)&val,v);
+              return se->op((gpointer)&state->creation_time,v);
             }
             break;
         case LTTV_FILTER_STATE_IT:
-            if(state == NULL) rresult = TRUE;
+            if(state == NULL) return TRUE;
             else {
-              double val = ltt_time_to_double(state->insertion_time);
-              rresult = t->r_child.leaf->op((gpointer)&val,v);
+              return se->op((gpointer)&state->insertion_time,v);
             }
             break;
         case LTTV_FILTER_STATE_P_NAME:
-            /*
-             * FIXME: Yet to be done ( I think ? )
-             */
-            rresult = TRUE;
+            if(state == NULL) return TRUE;
+            else {
+              GQuark quark = state->name;
+              return se->op((gpointer)&quark,v);
+            }
+            break;
+        case LTTV_FILTER_STATE_T_BRAND:
+            if(state == NULL) return TRUE;
+            else {
+              GQuark quark = state->brand;
+              return se->op((gpointer)&quark,v);
+            }
             break;
         case LTTV_FILTER_STATE_EX_MODE:
-            if(state == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)&state->state->t,v);
+            if(state == NULL) return TRUE;
+            else return se->op((gpointer)&state->state->t,v);
             break;
         case LTTV_FILTER_STATE_EX_SUBMODE:
-            if(state == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)&state->state->n,v);
+            if(state == NULL) return TRUE;
+            else return se->op((gpointer)&state->state->n,v);
             break;
         case LTTV_FILTER_STATE_P_STATUS:
-            if(state == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)&state->state->s,v);
+            if(state == NULL) return TRUE;
+            else return se->op((gpointer)&state->state->s,v);
             break;
         case LTTV_FILTER_STATE_CPU:
-            /*
-             * FIXME: What is the comparison value ?
-             */
-            rresult = TRUE;
+            if(state == NULL) return TRUE;
+            else {
+              return se->op((gpointer)&state->cpu,v);
+            }
             break;
         case LTTV_FILTER_EVENT_NAME:
-            if(event == NULL) rresult = TRUE;
-            else rresult = t->r_child.leaf->op((gpointer)ltt_event_eventtype(event),v);
+            if(event == NULL) return TRUE;
+            else {
+              struct marker_info *info;
+              info = marker_get_info_from_id((LttTrace *)trace, event->event_id);
+              g_assert(info != NULL);
+              GQuark quark = info->name;
+              return se->op((gpointer)&quark,v);
+            }
             break;
-            
         case LTTV_FILTER_EVENT_CATEGORY:
             /*
-             * FIXME: Not yet implemented
+             * TODO: Not yet implemented
              */
-            rresult = TRUE;
+            return TRUE;
             break;
         case LTTV_FILTER_EVENT_TIME:
-//            if(event == NULL) rresult = TRUE;
-//            else {
-//                double val = ltt_time_to_double(event->event_time);
-//                rresult = t->r_child.leaf->op((gpointer)&val,v);
-//            }
-            rresult = TRUE;
+            if(event == NULL) return TRUE;
+            else {
+                LttTime time = ltt_event_time(event);
+                return se->op((gpointer)&time,v);
+            }
             break;
         case LTTV_FILTER_EVENT_TSC:
-//          if(event == NULL) rresult = TRUE;
-//          else {
-//            double val = ltt_time_to_double(event->event_time);
-//            rresult = t->r_child.leaf->op((gpointer)&val,v);
-//          }
-            /*
-             * FIXME: Where is event.tsc
-             */
-            rresult = 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_TARGET_PID:
+            if(context == NULL) return TRUE;
+            else {
+              guint target_pid =
+                     lttv_state_get_target_pid((LttvTracefileState*)context);
+              return se->op((gpointer)&target_pid,v);
+            }
             break;
         case LTTV_FILTER_EVENT_FIELD:
             /*
@@ -1631,105 +2064,51 @@ lttv_filter_tree_parse(
              * find the dynamic field 
              * in the event struct
              */
-            rresult = TRUE; 
+            return TRUE; 
         default:
             /*
              * This case should never be 
-             * parsed, if so, this subtree
-             * is cancelled !
+             * parsed, if so, the whole 
+             * filtering is cancelled
              */
             g_warning("Error while parsing the filter tree");
             return TRUE;
     }
-  }
-   
-  /*
-   * Apply and return the 
-   * logical link between the 
-   * two operation
-   */
-  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_XOR: return (lresult ^ rresult);
-    default: 
-      /*
-       * This case should never be 
-       * parsed, if so, this subtree
-       * is cancelled !
-       */
-      return TRUE;
-  }
-  
+
+    /* should never get here */
+    return TRUE;
+    
 }
 
+
+
 /**
- *  @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(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_debug("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_assert(t->l_child.leaf->value != NULL);
-    g_print("%p: left is %i %p %s\n",t,t->l_child.leaf->field,t->l_child.leaf->op,t->l_child.leaf->value);
+          (t->right==LTTV_TREE_NODE)?t->r_child.t:NULL,
+          count);
+  g_debug("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE"))));
+  g_debug("|-> 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_debug("| |-> field type number: %i\n",t->l_child.leaf->field);
+    g_debug("| |-> offset is: %i\n",t->l_child.leaf->offset);
+    g_debug("| |-> operator function is: %p\n",t->l_child.leaf->op);
   }
-  g_print("1\n");
-  if(t->right == LTTV_TREE_NODE) lttv_print_tree(t->r_child.t);
-  else if(t->right == LTTV_TREE_LEAF) {
-    fprintf(stderr,"leaf!\n");
-//    g_assert(t->r_child.leaf->value != NULL);
-    fprintf(stderr,"%p: right is %i %p %s\n",t,t->r_child.leaf->field,t->r_child.leaf->op,t->r_child.leaf->value);
+  g_debug("|-> 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_debug("| |-> field type number: %i\n",t->r_child.leaf->field);
+    g_debug("| |-> offset is: %i\n",t->r_child.leaf->offset);
+    g_debug("| |-> operator function is: %p\n",t->r_child.leaf->op);
   }
-}
-
-/**
- *  gboolean lttv_filter_tracefile(LttvFilter*, LttTracefile*)
- * 
- *     Apply the filter to a specific trace
- *     @param filter the current filter applied
- *     @param tracefile the trace to apply the filter to
- *     @return success/failure of operation
- */
-gboolean
-lttv_filter_tracefile(LttvFilter *filter, LttTracefile *tracefile) {
-
-  return lttv_filter_tree_parse(filter->head,NULL,tracefile,NULL,NULL);
-  
-}
-
-/**
- *  @fn gboolean lttv_filter_tracestate(LttvFilter*,LttvTraceState*)
- *  
- *  Parse the current tracestate
- *  @param filter pointer to the current LttvFilter
- *  @param tracestate pointer to the current tracestate
- */
-gboolean
-lttv_filter_tracestate(LttvFilter *filter, LttvTraceState *tracestate) {
-
-}
-
-/**
- *  @fn gboolean lttv_filter_event(LttvFilter*,LttEvent*)
- * 
- *     Apply the filter to a specific event
- *     @param filter the current filter applied
- *     @param event the event to apply the filter to
- *     @return success/failure of operation
- */
-gboolean
-lttv_filter_event(LttvFilter *filter, LttEvent *event) {
 
+  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);
 }
 
 /**
This page took 0.049268 seconds and 4 git commands to generate.