text module
[lttv.git] / ltt / branches / poly / lttv / lttv / filter.c
index 0c6516592814dc029692d0f709a53a5222348dab..b5986c9aaf54eba18dcfb18ea821ec1d59da1bd0 100644 (file)
@@ -54,6 +54,7 @@
  *  - 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
  */
 
 #include <lttv/filter.h>
@@ -80,12 +81,9 @@ GQuark
   LTTV_FILTER_CPU;
 */
 
-LttvSimpleExpression* 
-lttv_simple_expression_new() {
-
-}
 /**
  * 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
@@ -118,258 +116,638 @@ lttv_filter_tree_add_node(GPtrArray* stack, LttvFilterTree* subtree, LttvLogical
   
 }
 
+
+/**
+ * Constructor for LttvSimpleExpression
+ * @return pointer to new LttvSimpleExpression
+ */
+LttvSimpleExpression* 
+lttv_simple_expression_new() {
+
+  LttvSimpleExpression* se = g_new(LttvSimpleExpression,1);
+
+  se->field = LTTV_FILTER_UNDEFINED;
+  se->op = NULL;
+  se->offset = 0;
+  se->value = NULL;
+
+  return se;
+}
+
 /**
  *  Parse through filtering field hierarchy as specified 
  *  by user.  This function compares each value to 
  *  predetermined quarks
  *  @param fp The field path list
+ *  @param se current simple expression
  *  @return success/failure of operation
  */
 gboolean
-parse_field_path(GPtrArray* fp) {
+parse_field_path(GPtrArray* fp, LttvSimpleExpression* se) {
 
   GString* f = NULL;
+//  g_print("fp->len:%i\n",fp->len);
+//  int i;
+//  for(i=0;i<fp->len;i++) { 
+//      GString* f2 = g_ptr_array_index(fp,i);
+//      g_print("%i=%s",i,f2->str); 
+//  }
   if(fp->len < 2) return FALSE;
   g_assert(f=g_ptr_array_index(fp,0)); //list_first(fp)->data; 
-  
-  if(g_quark_try_string(f->str) == LTTV_FILTER_EVENT) {
+  /*
+   * Parse through the specified 
+   * hardcoded fields.
+   *
+   * Take note however that the 
+   * 'event' subfields might change 
+   * depending on values specified 
+   * in core.xml file.  Hence, if 
+   * none of the subfields in the 
+   * array match the hardcoded 
+   * subfields, it will be considered 
+   * as a dynamic field
+   */
+  if(!g_strcasecmp(f->str,"trace") ) {
+    /*
+     * Possible values:
+     *  trace.name
+     */
     f=g_ptr_array_index(fp,1);
-    if(g_quark_try_string(f->str) == LTTV_FILTER_NAME) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_CATEGORY) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_TIME) {
-      // offset = &((LttEvent*)NULL)->event_time);
+    if(!g_strcasecmp(f->str,"name")) {
+      se->field = LTTV_FILTER_TRACE_NAME;    
     }
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_TSC) {
-      // offset = &((LttEvent*)NULL)->event_cycle_count);
-    }
-    else {  /* core.xml specified options */
-
-    }
-  } else if(g_quark_try_string(f->str) == LTTV_FILTER_TRACEFILE) {
-     f=g_ptr_array_index(fp,1);
-    if(g_quark_try_string(f->str) == LTTV_FILTER_NAME) {}
     else return FALSE;
-  } else if(g_quark_try_string(f->str) == LTTV_FILTER_TRACE) {
+  } else if(!g_strcasecmp(f->str,"traceset") ) {
+    /* 
+     * FIXME: not yet implemented !
+     */
+  } else if(!g_strcasecmp(f->str,"tracefile") ) {
+    /*
+     * Possible values:
+     *  tracefile.name
+     */
     f=g_ptr_array_index(fp,1);
-    if(g_quark_try_string(f->str) == LTTV_FILTER_NAME) {}
+    if(!g_strcasecmp(f->str,"name")) {
+      se->field = LTTV_FILTER_TRACEFILE_NAME;
+    }
     else return FALSE;
-
-  } else if(g_quark_try_string(f->str) == LTTV_FILTER_STATE) {
+  } else if(!g_strcasecmp(f->str,"state") ) {
+    /*
+     * Possible values:
+     *  state.pid
+     *  state.ppid
+     *  state.creation_time
+     *  state.insertion_time
+     *  state.process_name
+     *  state.execution_mode
+     *  state.execution_submode
+     *  state.process_status
+     *  state.cpu
+     */
     f=g_ptr_array_index(fp,1);
-    if(g_quark_try_string(f->str) == LTTV_FILTER_PID) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_PPID) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_C_TIME) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_I_TIME) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_P_NAME) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_EX_MODE) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_EX_SUBMODE) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_P_STATUS) {}
-    else if(g_quark_try_string(f->str) == LTTV_FILTER_CPU) {}
+    if(!g_strcasecmp(f->str,"pid") ) { 
+      se->field = LTTV_FILTER_STATE_PID; 
+    }
+    else if(!g_strcasecmp(f->str,"ppid") ) { 
+      se->field = LTTV_FILTER_STATE_PPID; 
+    }
+    else if(!g_strcasecmp(f->str,"creation_time") ) {
+      se->field = LTTV_FILTER_STATE_CT;
+    }
+    else if(!g_strcasecmp(f->str,"insertion_time") ) {
+      se->field = LTTV_FILTER_STATE_IT;
+    }
+    else if(!g_strcasecmp(f->str,"process_name") ) {
+      se->field = LTTV_FILTER_STATE_P_NAME;
+    }
+    else if(!g_strcasecmp(f->str,"execution_mode") ) {
+      se->field = LTTV_FILTER_STATE_EX_MODE;
+    }
+    else if(!g_strcasecmp(f->str,"execution_submode") ) {
+      se->field = LTTV_FILTER_STATE_EX_SUBMODE;
+    }
+    else if(!g_strcasecmp(f->str,"process_status") ) {
+      se->field = LTTV_FILTER_STATE_P_STATUS;
+    }
+    else if(!g_strcasecmp(f->str,"cpu") ) {
+      se->field = LTTV_FILTER_STATE_CPU;
+    }
     else return FALSE;
-
+  } else if(!g_strcasecmp(f->str,"event") ) {
+    /*
+     * Possible values:
+     *  event.name
+     *  event.category
+     *  event.time
+     *  event.tsc
+     */
+    f=g_ptr_array_index(fp,1);
+    if(!g_strcasecmp(f->str,"name") ) {
+      se->field = LTTV_FILTER_EVENT_NAME;
+    }
+    else if(!g_strcasecmp(f->str,"category") ) {
+      /*
+       * FIXME: Category not yet functional in lttv
+       */
+      se->field = LTTV_FILTER_EVENT_CATEGORY;
+    }
+    else if(!g_strcasecmp(f->str,"time") ) {
+      se->field = LTTV_FILTER_EVENT_TIME;
+      // offset = &((LttEvent*)NULL)->event_time);
+    }
+    else if(!g_strcasecmp(f->str,"tsc") ) {
+      se->field = LTTV_FILTER_EVENT_TSC;
+      // offset = &((LttEvent*)NULL)->event_cycle_count);
+    }
+    else {  /* core.xml specified options */
+      se->field = LTTV_FILTER_EVENT_FIELD;
+      //se->offset = (...);
+    }
   } else {
     g_warning("Unrecognized field in filter string");
     return FALSE;
   }
+
+  /* free the pointer array */
+  g_ptr_array_free(fp,FALSE);
+  
   return TRUE;  
 }
 
 /**
- *     Add an filtering option to the current tree
- *     @param expression Current expression to parse
- *     @return success/failure of operation
+ *  Sets the function pointer for the current
+ *  Simple Expression
+ *  @param se current simple expression
+ *  @return success/failure of operation
  */
-gboolean
-parse_simple_expression(GString* expression) {
-       
-       unsigned i;
-
-  
+gboolean 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) {
+     /* char */
+     case LTTV_FILTER_TRACE_NAME:
+     case LTTV_FILTER_TRACEFILE_NAME:
+     case LTTV_FILTER_STATE_P_NAME:
+     case LTTV_FILTER_EVENT_NAME:
+       switch(op) {
+         case LTTV_FIELD_EQ:
+           se->op = lttv_apply_op_eq_string;
+           break;
+         case LTTV_FIELD_NE:
+           se->op = lttv_apply_op_eq_string;
+           break;
+         default:
+           g_warning("Error encountered in operator assignment");
+           return FALSE;
+       }
+       break;
+     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:
+       switch(op) {
+         case LTTV_FIELD_EQ:
+           se->op = lttv_apply_op_eq_uint64;
+           break;
+         case LTTV_FIELD_NE:
+           se->op = lttv_apply_op_ne_uint64;
+           break;
+         case LTTV_FIELD_LT:
+           se->op = lttv_apply_op_lt_uint64;
+           break;
+         case LTTV_FIELD_LE:
+           se->op = lttv_apply_op_le_uint64;
+           break;
+         case LTTV_FIELD_GT:
+           se->op = lttv_apply_op_gt_uint64;
+           break;
+         case LTTV_FIELD_GE:
+           se->op = lttv_apply_op_ge_uint64;
+           break;
+         default:
+           g_warning("Error encountered in operator assignment");
+           return FALSE;
+       }
+       break;
+     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;
+           break;
+         case LTTV_FIELD_NE:
+           se->op = lttv_apply_op_ne_double;
+           break;
+         case LTTV_FIELD_LT:
+           se->op = lttv_apply_op_lt_double;
+           break;
+         case LTTV_FIELD_LE:
+           se->op = lttv_apply_op_le_double;
+           break;
+         case LTTV_FIELD_GT:
+           se->op = lttv_apply_op_gt_double;
+           break;
+         case LTTV_FIELD_GE:
+           se->op = lttv_apply_op_ge_double;
+           break;
+         default:
+           g_warning("Error encountered in operator assignment");
+           return FALSE;
+       }
+       break;
+     default:
+       g_warning("Error encountered in operator assignment");
+       return FALSE;
+   }
   
+  return TRUE;
 
 }
 
+/**
+ *  Finds the structure type depending 
+ *  on the fields in parameters
+ *  @params ft Field of the current structure
+ *  @return LttvStructType enum or -1 for error
+ */
+gint
+lttv_struct_type(gint ft) {
+  
+    switch(ft) {
+        case LTTV_FILTER_TRACE_NAME:
+            return LTTV_FILTER_TRACE;
+            break;
+        case LTTV_FILTER_TRACEFILE_NAME:
+            return LTTV_FILTER_TRACEFILE;
+            break;
+        case LTTV_FILTER_STATE_PID:
+        case LTTV_FILTER_STATE_PPID:
+        case LTTV_FILTER_STATE_CT:
+        case LTTV_FILTER_STATE_IT:
+        case LTTV_FILTER_STATE_P_NAME:
+        case LTTV_FILTER_STATE_EX_MODE:
+        case LTTV_FILTER_STATE_EX_SUBMODE:
+        case LTTV_FILTER_STATE_P_STATUS:
+        case LTTV_FILTER_STATE_CPU:
+            return LTTV_FILTER_STATE;
+            break;
+        case LTTV_FILTER_EVENT_NAME:
+        case LTTV_FILTER_EVENT_CATEGORY:
+        case LTTV_FILTER_EVENT_TIME:
+        case LTTV_FILTER_EVENT_TSC:
+        case LTTV_FILTER_EVENT_FIELD:
+            return LTTV_FILTER_EVENT;
+            break;
+        default:
+            return -1;
+    }
+}
+
 /**
  *  Applies the 'equal' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_eq_uint64(gpointer v1, char* v2) {
+
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r == l);
+  
+}
 
 /**
  *  Applies the 'equal' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_eq_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r == l);
+}
 
 /**
  *  Applies the 'equal' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_eq_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r == l);
+}
 
 /**
  *  Applies the 'equal' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_eq_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r == l);
+}
 
 /**
  *  Applies the 'equal' operator to the
- *  specified structure and value
+ *  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_string() {}
+gboolean lttv_apply_op_eq_string(gpointer v1, char* v2) {
+  char* r = (char*) v1;
+  return (!g_strcasecmp(r,v2));
+}
 
 /**
  *  Applies the 'not equal' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_ne_uint64(gpointer v1, char* v2) {
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r != l);
+}
 
 /**
  *  Applies the 'not equal' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_ne_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r != l);
+}
 
 /**
  *  Applies the 'not equal' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_ne_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r != l);
+}
 
 /**
  *  Applies the 'not equal' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_ne_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r != l);
+}
 
 /**
  *  Applies the 'not equal' operator to the
- *  specified structure and value
+ *  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_string() {}
+gboolean lttv_apply_op_ne_string(gpointer v1, char* v2) {
+  char* r = (char*) v1;
+  return (g_strcasecmp(r,v2));
+}
 
 /**
  *  Applies the 'lower than' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_lt_uint64(gpointer v1, char* v2) {
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r < l);
+}
 
 /**
  *  Applies the 'lower than' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_lt_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r < l);
+}
 
 /**
  *  Applies the 'lower than' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_lt_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r < l);
+}
 
 /**
  *  Applies the 'lower than' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_lt_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r < l);
+}
 
 /**
  *  Applies the 'lower than' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_le_uint64(gpointer v1, char* v2) {
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r <= l);
+}
 
 /**
  *  Applies the 'lower or equal' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_le_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r <= l);
+}
 
 /**
  *  Applies the 'lower or equal' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_le_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r <= l);
+}
 
 /**
  *  Applies the 'lower or equal' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_le_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r <= l);
+}
 
 /**
- *  Applies the 'lower or equal' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_gt_uint64(gpointer v1, char* v2) {
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r > l);
+}
 
 /**
  *  Applies the 'greater than' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_gt_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r > l);
+}
 
 /**
  *  Applies the 'greater than' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_gt_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r > l);
+}
 
 /**
  *  Applies the 'greater than' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_gt_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r > l);
+}
 
 /**
- *  Applies the 'greater than' operator to the
- *  specified structure and value
+ *  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_uint64() {}
+gboolean lttv_apply_op_ge_uint64(gpointer v1, char* v2) {
+  guint64* r = (guint64*) v1;
+  guint64 l = atoi(v2);
+  return (*r >= l);
+}
 
 /**
  *  Applies the 'greater or equal' operator to the
- *  specified structure and value
+ *  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_uint32() {}
+gboolean lttv_apply_op_ge_uint32(gpointer v1, char* v2) {
+  guint32* r = (guint32*) v1;
+  guint32 l = atoi(v2);
+  return (*r >= l);
+}
 
 /**
  *  Applies the 'greater or equal' operator to the
- *  specified structure and value
+ *  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_uint16() {}
+gboolean lttv_apply_op_ge_uint16(gpointer v1, char* v2) {
+  guint16* r = (guint16*) v1;
+  guint16 l = atoi(v2);
+  return (*r >= l);
+}
 
 /**
  *  Applies the 'greater or equal' operator to the
- *  specified structure and value
+ *  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_double() {}
+gboolean lttv_apply_op_ge_double(gpointer v1, char* v2) {
+  double* r = (double*) v1;
+  double l = atof(v2);
+  return (*r >= l);
+}
 
 
 /**
@@ -380,8 +758,34 @@ gboolean lttv_apply_op_ge_double() {}
 LttvFilterTree*
 lttv_filter_tree_clone(LttvFilterTree* tree) {
 
-  
+  LttvFilterTree* newtree = lttv_filter_tree_new();  
 
+  newtree->node = tree->node;
+  newtree->left = tree->left;
+  if(newtree->left == LTTV_TREE_NODE) {
+    newtree->l_child.t = lttv_filter_tree_clone(tree->l_child.t);
+  } else if(newtree->left == LTTV_TREE_LEAF) {
+    newtree->l_child.leaf = lttv_simple_expression_new();
+    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);
+  }
+  newtree->right = tree->right;
+  if(newtree->right == LTTV_TREE_NODE) {
+    newtree->r_child.t = lttv_filter_tree_clone(tree->r_child.t);
+  } else if(newtree->right == LTTV_TREE_LEAF) {
+    newtree->r_child.leaf = lttv_simple_expression_new();
+    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);
+  }
+  
+  return newtree;
+  
 }
 
 /**
@@ -412,10 +816,27 @@ lttv_filter_clone(LttvFilter* filter) {
  *     @return the current lttv_filter or NULL if error
  */
 LttvFilter*
-lttv_filter_new(char *expression, LttvTraceState *tcs) {
+lttv_filter_new() {
 
-  g_print("filter::lttv_filter_new()\n");              /* debug */
+  LttvFilter* filter = g_new(LttvFilter,1);
+  filter->expression = NULL;
+  filter->head = NULL;
+    
+}
 
+/**
+ *  Updates the current LttvFilter by building 
+ *  its tree based upon the expression string
+ *  @param filter pointer to the current LttvFilter
+ *  @return Failure/Success of operation
+ */
+gboolean
+lttv_filter_update(LttvFilter* filter) {
+    
+  g_print("filter::lttv_filter_new()\n");              /* debug */
+  
+  if(filter->expression == NULL) return FALSE;
+  
   unsigned     
     i, 
     p_nesting=0,       /* parenthesis nesting value */
@@ -428,6 +849,14 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
     *t1,                              /* buffer #1 */
     *t2;                              /* buffer #2 */
 
+  /* 
+   * the filter
+   * If the tree already exists, 
+   * destroy it and build a new one
+   */
+  if(filter->head != NULL) lttv_filter_tree_destroy(filter->head);
+  filter->head = tree;
   /*
    * Tree Stack
    * each element of the list
@@ -444,7 +873,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
   GString *a_field_component = g_string_new(""); 
   GPtrArray *a_field_path = NULL;
     
-  LttvSimpleExpression* a_simple_expression = g_new(LttvSimpleExpression,1);
+  LttvSimpleExpression* a_simple_expression = lttv_simple_expression_new(); 
   
   /*
    *   Parse entire expression and construct
@@ -478,87 +907,98 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
    */
   
   a_field_path = g_ptr_array_new();
-  g_ptr_array_set_size(a_field_path,2);   /* by default, recording 2 field expressions */
+//  g_ptr_array_set_size(a_field_path,2);   /* by default, recording 2 field expressions */
 
   
-  for(i=0;i<strlen(expression);i++) {
-//    g_print("%s\n",a_field_component->str);
-    g_print("%c ",expression[i]);
-//    g_print("switch:%c -->subtree:%p\n",expression[i],subtree);
-    switch(expression[i]) {
+  for(i=0;i<strlen(filter->expression);i++) {
+    // debug
+    int t;
+//    for(t=0;t<a_field_path->len;t++) { 
+//        GString* t3 = g_ptr_array_index(a_field_path,t);
+//        g_print("%i=%s ",t,t3->str); 
+//    }
+    g_print("%c ",filter->expression[i]);
+    switch(filter->expression[i]) {
       /*
        *   logical operators
        */
       case '&':   /* and */
+   
         t1 = (LttvFilterTree*)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_AND;
-        if(subtree != NULL) {
+        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 {
+        } else {  /* append a simple expression */
           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(LttvSimpleExpression,1);
+          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;
         t2 = lttv_filter_tree_new();
         t2->node = LTTV_LOGICAL_OR;
-        if(subtree != NULL) { 
+        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 {
+        } else {    /* append a simple expression */
           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(LttvSimpleExpression,1);
+          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;
         t2 = lttv_filter_tree_new();
         t2->node = LTTV_LOGICAL_XOR;
-        if(subtree != NULL) { 
+        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 {
+        } else {    /* append a simple expression */
           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(LttvSimpleExpression,1);
+          a_simple_expression = lttv_simple_expression_new(); 
           t1->right = LTTV_TREE_NODE;
           t1->r_child.t = t2; 
         }
         break;
+      
       case '!':   /* not, or not equal (math op) */
-        if(expression[i+1] == '=') {  /* != */
-          a_simple_expression->op = LTTV_FIELD_NE;
-          i++;
+        
+        if(filter->expression[i+1] == '=') {  /* != */
           g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+          parse_field_path(a_field_path,a_simple_expression);
           a_field_component = g_string_new("");         
+          assign_operator(a_simple_expression,LTTV_FIELD_NE);
+          i++;
         } else {  /* ! */
         //  g_print("%s\n",a_field_component);
         //  a_field_component = g_string_new("");
@@ -570,25 +1010,29 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           t1->r_child.t = t2;
         }
         break;
+      
       case '(':   /* start of parenthesis */
       case '[':
       case '{':
+        
         p_nesting++;      /* incrementing parenthesis nesting value */
         t1 = lttv_filter_tree_new();
         g_ptr_array_add( tree_stack,(gpointer) t1 );
         break;
+      
       case ')':   /* end of parenthesis */
       case ']':
       case '}':
+        
         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",expression);       
-          return NULL;
+                     is not valid due to parenthesis incorrect use",filter->expression);       
+          return FALSE;
         }
         
         g_assert(tree_stack->len>0);
-        if(subtree != NULL) { 
+        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);
@@ -598,14 +1042,14 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           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 {
+        } else {    /* assign subtree as current tree */
           a_simple_expression->value = a_field_component->str;
           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;
           t1->right = LTTV_TREE_LEAF;
           t1->r_child.leaf = a_simple_expression;
-          a_simple_expression = g_new(LttvSimpleExpression,1);
+          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);
@@ -616,35 +1060,52 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
        *       mathematic operators
        */
       case '<':   /* lower, lower or equal */
-        if(expression[i+1] == '=') { /* <= */
-          i++;
-          a_simple_expression->op = LTTV_FIELD_LE; 
-        } else a_simple_expression->op = LTTV_FIELD_LT;
+        
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+        parse_field_path(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
-        break;
-      case '>':   /* higher, higher or equal */
-        if(expression[i+1] == '=') {  /* >= */
+        if(filter->expression[i+1] == '=') { /* <= */
           i++;
-          a_simple_expression->op = LTTV_FIELD_GE;        
-        } else a_simple_expression->op = LTTV_FIELD_GT;
-        g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+          assign_operator(a_simple_expression,LTTV_FIELD_LE);
+        } else assign_operator(a_simple_expression,LTTV_FIELD_LT);
+       break;
+      
+      case '>':   /* higher, higher or equal */
+        
+        g_ptr_array_add( a_field_path,(gpointer) a_field_component );   
+        parse_field_path(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
-        break;
+        if(filter->expression[i+1] == '=') {  /* >= */
+          i++;
+          assign_operator(a_simple_expression,LTTV_FIELD_GE);
+        } else assign_operator(a_simple_expression,LTTV_FIELD_GT);
+       break;
+      
       case '=':   /* equal */
-        a_simple_expression->op = LTTV_FIELD_EQ;
+        
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+        parse_field_path(a_field_path,a_simple_expression);
         a_field_component = g_string_new("");         
+        assign_operator(a_simple_expression,LTTV_FIELD_EQ);
         break;
+        
       /*
        *  Field concatening caracter
        */
       case '.':   /* dot */
-        g_ptr_array_add( a_field_path,(gpointer) a_field_component );
-        a_field_component = g_string_new("");
+        
+        /*
+         * divide field expression into elements 
+         * in a_field_path array.
+         */
+//        if(a_simple_expression->op == NULL) {
+          g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+          a_field_component = g_string_new("");
+//        }
         break;
+      
       default:    /* concatening current string */
-        g_string_append_c(a_field_component,expression[i]);                            
+        g_string_append_c(a_field_component,filter->expression[i]);                            
     }
   }
 
@@ -657,12 +1118,12 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
    */
   if( p_nesting>0 ) { 
     g_warning("Wrong filtering options, the string\n\"%s\"\n\
-        is not valid due to parenthesis incorrect use",expression);    
-    return NULL;
+        is not valid due to parenthesis incorrect use",filter->expression);    
+    return FALSE;
   }
  
   if(tree_stack->len != 1) /* only root tree should remain */ 
-    return NULL;
+    return FALSE;
   
   /*  processing last element of expression   */
   t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
@@ -680,21 +1141,32 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
      * FIXME: is it really necessary to reallocate 
      *        LttvSimpleExpression at this point ??
      */
-    a_simple_expression = g_new(LttvSimpleExpression,1);
+    a_simple_expression = lttv_simple_expression_new();
   }
   
   g_assert(tree != NULL);
   g_assert(subtree == NULL); 
   
-  lttv_filter_tracefile(tree,NULL); 
-  
-  return tree;
+  lttv_print_tree(filter->head) ;
+
+  g_print("ended update tree!\n");
+  return TRUE;
+
+//  return filter;
   
 }
 
+/**
+ *  Destroy the current LttvFilter
+ *  @param filter pointer to the current LttvFilter
+ */
 void
 lttv_filter_destroy(LttvFilter* filter) {
-
+  
+  g_free(filter->expression);
+  lttv_filter_tree_destroy(filter->head);
+  g_free(filter);
+  
 }
 
 /**
@@ -702,23 +1174,60 @@ lttv_filter_destroy(LttvFilter* filter) {
  *  or sub expression
  *  @return pointer of LttvFilterTree
  */
-LttvFilterTree* lttv_filter_tree_new() {
+LttvFilterTree* 
+lttv_filter_tree_new() {
   LttvFilterTree* tree;
 
   tree = g_new(LttvFilter,1);
   tree->node = 0; //g_new(lttv_expression,1);
-//  tree->node->type = LTTV_UNDEFINED_EXPRESSION;
   tree->left = LTTV_TREE_IDLE;
   tree->right = LTTV_TREE_IDLE;
 
   return tree;
 }
 
+/**
+ *  Append a new expression to the expression 
+ *  defined in the current filter
+ *  @param filter pointer to the current LttvFilter
+ *  @param expression string that must be appended
+ */
+void lttv_filter_append_expression(LttvFilter* filter, char *expression) {
+
+  if(expression == NULL) return;
+  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);
+  }
+
+  lttv_filter_update(filter);
+  
+}
+
+/**
+ *  Clear the filter expression from the 
+ *  current filter and sets its pointer to NULL
+ *  @param filter pointer to the current LttvFilter
+ */
+void lttv_filter_clear_expression(LttvFilter* filter) {
+  
+  if(filter->expression != NULL) {
+    g_free(filter->expression);
+    filter->expression = NULL;
+  }
+  
+}
+
 /**
  *  Destroys the tree and his sub-trees
  *  @param tree Tree which must be destroyed
  */
-void lttv_filter_tree_destroy(LttvFilterTree* tree) {
+void 
+lttv_filter_tree_destroy(LttvFilterTree* tree) {
   
   if(tree == NULL) return;
 
@@ -732,66 +1241,350 @@ void lttv_filter_tree_destroy(LttvFilterTree* tree) {
   g_free(tree);
 }
 
-
 /**
- *     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
+ *  Global parsing function for the current
+ *  LttvFilterTree
+ *  @param tree 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
  */
 gboolean
-lttv_filter_tracefile(LttvFilter *filter, LttTracefile *tracefile) {
+lttv_filter_tree_parse(
+        LttvFilterTree* t,
+        LttEvent* event,
+        LttTracefile* tracefile,
+        LttTrace* trace,
+        LttvProcessState* state
+        /*,...*/) 
+{
 
-  LttvFilterTree* t = filter->head;
-    
-  /*
+   /*
    *  Each tree is parsed in inorder.
    *  This way, it's possible to apply the left filter of the 
    *  tree, then decide whether or not the right branch should 
    *  be parsed depending on the linking logical operator
    *
-   *  As for the filtering structure, since we are trying 
-   *  to remove elements from the trace, it might be better 
-   *  managing an array of all items to be removed .. 
+   *  Each node consists in a
+   *  1. logical operator
+   *  2. left child ( node or simple expression )
+   *  3. right child ( node or simple expression )
+   *  
+   *  When the child is a simple expression, we must 
+   *  before all determine if the expression refers to 
+   *  a structure which is whithin observation ( not NULL ). 
+   *    -If so, the expression is evaluated.
+   *    -If not, the result is set to TRUE since this particular 
+   *     operation does not interfere with the lttv structure
+   *
+   *  The result of each simple expression will directly 
+   *  affect the next branch.  This way, depending on 
+   *  the linking logical operator, the parser will decide 
+   *  to explore or not the next branch.
+   *  1. AND OPERATOR
+   *     -If result of left branch is 0 / FALSE
+   *      then don't explore right branch and return 0;
+   *     -If result of left branch is 1 / TRUE then explore
+   *  2. OR OPERATOR
+   *     -If result of left branch is 1 / TRUE
+   *      then don't explore right branch and return 1;
+   *     -If result of left branch is 0 / FALSE then explore
+   *  3. XOR OPERATOR
+   *     -Result of left branchwill not affect exploration of 
+   *      right branch
    */
+
+  gboolean lresult = FALSE, rresult = FALSE;
   
-  g_print("node:%p lchild:%p rchild:%p\n",t,t->l_child.t,t->r_child.t);
-  g_print("node type%i\n",t->node);
-  if(t->left == LTTV_TREE_NODE) lttv_filter_tracefile(t->l_child.t,NULL);
+  /*
+   * Parse left branch
+   */
+  if(t->left == LTTV_TREE_NODE) lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,state);
   else if(t->left == LTTV_TREE_LEAF) {
-    g_assert(t->l_child.leaf->value != NULL);
-    g_print("%p: left is qqch %i %s\n",t,t->l_child.leaf->op,t->l_child.leaf->value);
+    //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;
+    }
   }
-  if(t->right == LTTV_TREE_NODE) lttv_filter_tracefile(t->r_child.t,NULL);
+  /*
+   * Parse linking operator
+   * make a cutoff if possible
+   */
+  if((t->node & LTTV_LOGICAL_OR) && lresult == TRUE) return TRUE;
+  if((t->node & LTTV_LOGICAL_AND) && lresult == FALSE) return FALSE;
+
+  /*
+   * Parse right branch
+   */
+  if(t->right == LTTV_TREE_NODE) rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,state);
   else if(t->right == LTTV_TREE_LEAF) {
-    g_assert(t->r_child.leaf->value != NULL);
-    g_print("%p: right is qqch %i %s\n",t,t->r_child.leaf->op,t->r_child.leaf->value);
+    //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) {
+        
+        case LTTV_FILTER_TRACE_NAME:
+            if(trace == NULL) rresult = TRUE;
+            else rresult = t->r_child.leaf->op((gpointer)ltt_trace_name(trace),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);
+            break;
+        case LTTV_FILTER_STATE_PID:
+            if(state == NULL) rresult = TRUE;
+            else rresult = t->r_child.leaf->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);
+            break;
+        case LTTV_FILTER_STATE_CT:
+            if(state == NULL) rresult = TRUE;
+            else {
+              double val = ltt_time_to_double(state->creation_time);
+              rresult = t->r_child.leaf->op((gpointer)&val,v);
+            }
+            break;
+        case LTTV_FILTER_STATE_IT:
+            if(state == NULL) rresult = TRUE;
+            else {
+              double val = ltt_time_to_double(state->insertion_time);
+              rresult = t->r_child.leaf->op((gpointer)&val,v);
+            }
+            break;
+        case LTTV_FILTER_STATE_P_NAME:
+            /*
+             * FIXME: Yet to be done ( I think ? )
+             */
+            rresult = TRUE;
+            break;
+        case LTTV_FILTER_STATE_EX_MODE:
+            if(state == NULL) rresult = TRUE;
+            else rresult = t->r_child.leaf->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);
+            break;
+        case LTTV_FILTER_STATE_P_STATUS:
+            if(state == NULL) rresult = TRUE;
+            else rresult = t->r_child.leaf->op((gpointer)&state->state->s,v);
+            break;
+        case LTTV_FILTER_STATE_CPU:
+            /*
+             * FIXME: What is the comparison value ?
+             */
+            rresult = TRUE;
+            break;
+        case LTTV_FILTER_EVENT_NAME:
+            if(event == NULL) rresult = TRUE;
+            else rresult = t->r_child.leaf->op((gpointer)ltt_event_eventtype(event),v);
+            break;
+            
+        case LTTV_FILTER_EVENT_CATEGORY:
+            /*
+             * FIXME: Not yet implemented
+             */
+            rresult = 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;
+            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;
+            break;
+        case LTTV_FILTER_EVENT_FIELD:
+            /*
+             * TODO: Use the offset to 
+             * find the dynamic field 
+             * in the event struct
+             */
+            rresult = TRUE; 
+        default:
+            /*
+             * This case should never be 
+             * parsed, if so, this subtree
+             * is cancelled !
+             */
+            g_warning("Error while parsing the filter tree");
+            return TRUE;
+    }
   }
-  
-  /* test */
-/*  int i, nb;
-  char *f_name, *e_name;
-
-  char* field = "cpu";
    
-  LttvTraceHook h;
-
-  LttEventType *et;
-
-  LttType *t;
+  /*
+   * 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;
+  }
+  
+}
 
-  GString *fe_name = g_string_new("");
+/**
+ * Debug
+ */
+void
+lttv_print_tree(LttvFilterTree* t) {
 
-  nb = ltt_trace_eventtype_number(tcs->parent.t);
-  g_print("NB:%i\n",nb);
-  for(i = 0 ; i < nb ; i++) {
-    et = ltt_trace_eventtype_get(tcs->parent.t, i);
-    e_name = ltt_eventtype_name(et);
-    f_name = ltt_facility_name(ltt_eventtype_facility(et));
-    g_string_printf(fe_name, "%s.%s", f_name, e_name);
-    g_print("facility:%s and event:%s\n",f_name,e_name);
+  g_print("node:%p lchild:%p rchild:%p\n",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);
+  }
+  g_print("1\n");
+  if(t->right == LTTV_TREE_NODE) lttv_print_tree(t->r_child.t);
+  else if(t->right == LTTV_TREE_LEAF) {
+    g_assert(t->r_child.leaf->value != NULL);
+    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);
   }
+  g_print("end\n");
+}
+
+/**
+ *     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);
+  
 }
 
 gboolean
This page took 0.037819 seconds and 4 git commands to generate.