filter core:
[lttv.git] / ltt / branches / poly / lttv / lttv / filter.c
index 7bfcc25951d49762d81ee4cb6fb0bf46a36ed3f7..0c6516592814dc029692d0f709a53a5222348dab 100644 (file)
  * MA 02111-1307, USA.
  */
 
-/*
-   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
- *  - the exists an other lttv_filter which conflicts with this one 
- */
-
-#include <lttv/filter.h>
-
 /*
   read_token
 
   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
+ */
+
+/*
+ *  TODO 
+ *  - refine switch of expression in multiple uses functions
+ *    - remove the idle expressions in the tree **** 
+ *  - add the current simple expression to the tree
+ */
+
+#include <lttv/filter.h>
+
+/*
 GQuark
   LTTV_FILTER_TRACE,
   LTTV_FILTER_TRACESET,
@@ -72,38 +78,44 @@ GQuark
   LTTV_FILTER_EX_SUBMODE,
   LTTV_FILTER_P_STATUS,
   LTTV_FILTER_CPU;
-  
-/**
- *  Assign a new tree for the current expression
- *  or sub expression
- *  @return pointer of lttv_filter_tree
- */
-lttv_filter_tree* lttv_filter_tree_new() {
-  lttv_filter_tree* tree;
+*/
 
-  tree = g_new(lttv_filter_tree,1);
-  tree->node = g_new(lttv_expression,1);
-  tree->node->type = LTTV_UNDEFINED_EXPRESSION;
-  tree->left = LTTV_TREE_UNDEFINED;
-  tree->right = LTTV_TREE_UNDEFINED;
+LttvSimpleExpression* 
+lttv_simple_expression_new() {
 
-  return tree;
 }
-
 /**
- *  Destroys the tree and his sub-trees
- *  @param tree Tree which must be destroyed
+ * add a node to the current tree
+ * @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_destroy(lttv_filter_tree* tree) {
-
-  if(tree->left == LTTV_TREE_LEAF) g_free(tree->l_child.leaf);
-  else if(tree->left == LTTV_TREE_NODE) lttv_filter_tree_destroy(tree->l_child.t);
-
-  if(tree->right == LTTV_TREE_LEAF) g_free(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);
+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 = t1->r_child.t;
+  t2 = lttv_filter_tree_new();
+  t2->node = op;
+  if(subtree != NULL) {
+    t2->left = LTTV_TREE_NODE;
+    t2->l_child.t = 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; 
+  }
+  
 }
 
 /**
@@ -117,16 +129,43 @@ gboolean
 parse_field_path(GPtrArray* fp) {
 
   GString* f = NULL;
+  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_subfield(fp, LTTV_FILTER_EVENT);   
+    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);
+    }
+    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) {
+    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_STATE) {
+    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) {}
+    else return FALSE;
 
   } else {
     g_warning("Unrecognized field in filter string");
@@ -150,13 +189,229 @@ parse_simple_expression(GString* expression) {
 
 }
 
+/**
+ *  Applies the 'equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_uint64() {}
+
+/**
+ *  Applies the 'equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_uint32() {}
+
+/**
+ *  Applies the 'equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_uint16() {}
+
+/**
+ *  Applies the 'equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_double() {}
+
+/**
+ *  Applies the 'equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_eq_string() {}
+
+/**
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_uint64() {}
+
+/**
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_uint32() {}
+
+/**
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_uint16() {}
+
+/**
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_double() {}
+
+/**
+ *  Applies the 'not equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ne_string() {}
+
+/**
+ *  Applies the 'lower than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_lt_uint64() {}
+
+/**
+ *  Applies the 'lower than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_lt_uint32() {}
+
+/**
+ *  Applies the 'lower than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_lt_uint16() {}
+
+/**
+ *  Applies the 'lower than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_lt_double() {}
+
+/**
+ *  Applies the 'lower than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_le_uint64() {}
+
+/**
+ *  Applies the 'lower or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_le_uint32() {}
+
+/**
+ *  Applies the 'lower or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_le_uint16() {}
+
+/**
+ *  Applies the 'lower or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_le_double() {}
+
+/**
+ *  Applies the 'lower or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_gt_uint64() {}
+
+/**
+ *  Applies the 'greater than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_gt_uint32() {}
+
+/**
+ *  Applies the 'greater than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_gt_uint16() {}
+
+/**
+ *  Applies the 'greater than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_gt_double() {}
+
+/**
+ *  Applies the 'greater than' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ge_uint64() {}
+
+/**
+ *  Applies the 'greater or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ge_uint32() {}
+
+/**
+ *  Applies the 'greater or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ge_uint16() {}
+
+/**
+ *  Applies the 'greater or equal' operator to the
+ *  specified structure and value
+ *  @return success/failure of operation
+ */
+gboolean lttv_apply_op_ge_double() {}
+
+
+/**
+ * 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) {
+
+  
+
+}
+
+/**
+ * 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) {
+
+    
+  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);
+  
+  return newfilter;
+    
+}
+
+
 /**
  *     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
  */
-lttv_filter_tree*
+LttvFilter*
 lttv_filter_new(char *expression, LttvTraceState *tcs) {
 
   g_print("filter::lttv_filter_new()\n");              /* debug */
@@ -165,27 +420,31 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
     i, 
     p_nesting=0,       /* parenthesis nesting value */
     b=0;       /* current breakpoint in expression string */
-       
-  /* 
-   * Main tree & Tree concatening list 
+
+  /* trees */
+  LttvFilterTree
+    *tree = lttv_filter_tree_new(),   /* main tree */
+    *subtree = NULL,                  /* buffer for subtrees */
+    *t1,                              /* buffer #1 */
+    *t2;                              /* buffer #2 */
+
+  /*
+   * Tree Stack
    * each element of the list
    * is a sub tree created 
    * by the use of parenthesis in the 
    * global expression.  The final tree 
-   * will be the one created at the root of 
+   * will be the one left at the root of 
    * the list
    */
-  lttv_filter_tree* tree = NULL; 
-  lttv_filter_tree* subtree = NULL;
-  lttv_filter_tree* current_tree = NULL;
-  GPtrArray *tree_list = g_ptr_array_new();
-  g_ptr_array_add( tree_list,(gpointer) tree );
+  GPtrArray *tree_stack = g_ptr_array_new();
+  g_ptr_array_add( tree_stack,(gpointer) tree );
   
   /* temporary values */
   GString *a_field_component = g_string_new(""); 
   GPtrArray *a_field_path = NULL;
     
-  lttv_simple_expression a_simple_expression;
+  LttvSimpleExpression* a_simple_expression = g_new(LttvSimpleExpression,1);
   
   /*
    *   Parse entire expression and construct
@@ -199,79 +458,158 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
    *   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
+   *    2. create a new tree
+   *    3. add the expression (simple exp, or exp (subtree)) to the tree
+   *    4. concatenate this tree with the current tree on top of the stack
+   *  When encountering math ops >,>=,<,<=,=,!=
+   *    1. add to op to the simple expression
+   *    2. concatenate last field component to field path
+   *  When encountering concatening ops .
+   *    1. concatenate last field component to field path
+   *  When encountering opening parenthesis (,{,[
+   *    1. create a new subtree on top of tree stack
+   *  When encountering closing parenthesis ),},]
+   *    1. add the expression on right child of the current tree
+   *    2. the subtree is completed, allocate a new subtree
+   *    3. pop the tree value from the tree stack
    */
-
+  
   a_field_path = g_ptr_array_new();
   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("%s\n",a_field_component->str);
+    g_print("%c ",expression[i]);
+//    g_print("switch:%c -->subtree:%p\n",expression[i],subtree);
     switch(expression[i]) {
       /*
        *   logical operators
        */
       case '&':   /* and */
-        a_simple_expression.value = a_field_component->str;
-        a_field_component = g_string_new("");
-        lttv_filter_tree* t;
-        t = lttv_filter_tree_new();
-        t->node->type = LTTV_EXPRESSION_OP;
-        t->node->e.op = LTTV_LOGICAL_AND;
-        if(subtree != NULL) { 
-          t->left = LTTV_TREE_NODE;
-          t->l_child.t = subtree;
+        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) {
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = subtree;
           subtree = NULL;
+          t1->right = LTTV_TREE_NODE;
+          t1->r_child.t = t2;
         } else {
-          t->left = LTTV_TREE_LEAF;
-          t->l_child.leaf = g_new(lttv_simple_expression,1);
+          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);
+          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) { 
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = 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(LttvSimpleExpression,1);
+          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) { 
+          t2->left = LTTV_TREE_NODE;
+          t2->l_child.t = 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(LttvSimpleExpression,1);
+          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;
+          a_simple_expression->op = LTTV_FIELD_NE;
           i++;
+          g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+          a_field_component = g_string_new("");         
         } else {  /* ! */
-          g_print("%s\n",a_field_component);
-          a_field_component = g_string_new("");
+        //  g_print("%s\n",a_field_component);
+        //  a_field_component = g_string_new("");
+          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;
         }
         break;
       case '(':   /* start of parenthesis */
       case '[':
       case '{':
         p_nesting++;      /* incrementing parenthesis nesting value */
-        lttv_filter_tree* subtree = lttv_filter_tree_new();
-        g_ptr_array_add( tree_list,(gpointer) subtree );
+        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 */
-        a_simple_expression.value = a_field_component->str;
-        a_field_component = g_string_new("");
-        if(p_nesting<0 || tree_list->len<2) {
+        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;
         }
-      /*  lttv_filter_tree *sub1 = g_ptr_array_index(tree_list,tree_list->len-1);
-        lttv_filter_tree *sub2 = g_ptr_array_index(tree_list,tree_list->len);
-        if(sub1->left == LTTV_TREE_UNDEFINED){ 
-          sub1->l_child.t = sub2;
-          sub1->left = LTTV_TREE_NODE;
-        } else if(sub1->right == LTTV_TREE_UNDEFINED){
-          sub1->r_child.t = sub2; 
-          sub1->right = LTTV_TREE_NODE;
-        } else g_error("error during tree assignation");
-        g_ptr_array_remove_index(tree_list,tree_list->len);
-        break;
-        */
-        subtree = g_ptr_array_index(tree_list,tree_list->len);
-        g_ptr_array_remove_index(tree_list,tree_list->len);
+        
+        g_assert(tree_stack->len>0);
+        if(subtree != NULL) { 
+          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 {
+          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);
+          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);
+        }
         break;
 
       /*       
@@ -280,21 +618,21 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
       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;
+          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 );
         a_field_component = g_string_new("");         
         break;
       case '>':   /* higher, higher or equal */
         if(expression[i+1] == '=') {  /* >= */
           i++;
-          a_simple_expression.op = LTTV_FIELD_GE;        
-        } else a_simple_expression.op = LTTV_FIELD_GT;
+          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 );
         a_field_component = g_string_new("");         
         break;
       case '=':   /* equal */
-        a_simple_expression.op = LTTV_FIELD_EQ;
+        a_simple_expression->op = LTTV_FIELD_EQ;
         g_ptr_array_add( a_field_path,(gpointer) a_field_component );
         a_field_component = g_string_new("");         
         break;
@@ -310,15 +648,91 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
     }
   }
 
+  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",expression);    
     return NULL;
   }
+  if(tree_stack->len != 1) /* only root tree should remain */ 
+    return NULL;
+  
+  /*  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;
+  if(subtree != NULL) {  /* add the subtree */
+    t1->right = LTTV_TREE_NODE;
+    t1->r_child.t = subtree;
+    subtree = NULL;
+  } else {  /* add a leaf */
+    a_simple_expression->value = a_field_component->str;
+    a_field_component = g_string_new("");
+    t1->right = LTTV_TREE_LEAF;
+    t1->r_child.leaf = a_simple_expression;
+    /*
+     * FIXME: is it really necessary to reallocate 
+     *        LttvSimpleExpression at this point ??
+     */
+    a_simple_expression = g_new(LttvSimpleExpression,1);
+  }
+  
+  g_assert(tree != NULL);
+  g_assert(subtree == NULL); 
+  
+  lttv_filter_tracefile(tree,NULL); 
+  
+  return tree;
+  
+}
+
+void
+lttv_filter_destroy(LttvFilter* filter) {
+
 }
 
+/**
+ *  Assign a new tree for the current expression
+ *  or sub expression
+ *  @return pointer of LttvFilterTree
+ */
+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;
+}
+
+/**
+ *  Destroys the tree and his sub-trees
+ *  @param tree Tree which must be destroyed
+ */
+void lttv_filter_tree_destroy(LttvFilterTree* tree) {
+  
+  if(tree == NULL) return;
+
+  if(tree->left == LTTV_TREE_LEAF) g_free(tree->l_child.leaf);
+  else if(tree->left == LTTV_TREE_NODE) lttv_filter_tree_destroy(tree->l_child.t);
+
+  if(tree->right == LTTV_TREE_LEAF) g_free(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);
+}
+
+
 /**
  *     Apply the filter to a specific trace
  *     @param filter the current filter applied
@@ -326,9 +740,33 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
  *     @return success/failure of operation
  */
 gboolean
-lttv_filter_tracefile(lttv_filter_t *filter, LttTracefile *tracefile) {
+lttv_filter_tracefile(LttvFilter *filter, LttTracefile *tracefile) {
 
+  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 .. 
+   */
   
+  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);
+  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);
+  }
+  if(t->right == LTTV_TREE_NODE) lttv_filter_tracefile(t->r_child.t,NULL);
+  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);
+  }
   
   /* test */
 /*  int i, nb;
@@ -357,7 +795,7 @@ lttv_filter_tracefile(lttv_filter_t *filter, LttTracefile *tracefile) {
 }
 
 gboolean
-lttv_filter_tracestate(lttv_filter_t *filter, LttvTraceState *tracestate) {
+lttv_filter_tracestate(LttvFilter *filter, LttvTraceState *tracestate) {
 
 }
 
@@ -368,7 +806,7 @@ lttv_filter_tracestate(lttv_filter_t *filter, LttvTraceState *tracestate) {
  *     @return success/failure of operation
  */
 gboolean
-lttv_filter_event(lttv_filter_t *filter, LttEvent *event) {
+lttv_filter_event(LttvFilter *filter, LttEvent *event) {
 
 }
 
@@ -386,30 +824,30 @@ static void module_init()
    */
   
   /* top fields */
-  LTTV_FILTER_EVENT = g_quark_from_string("event"); 
-  LTTV_FILTER_TRACE = g_quark_from_string("trace"); 
-  LTTV_FILTER_TRACESET = g_quark_from_string("traceset"); 
-  LTTV_FILTER_STATE = g_quark_from_string("state"); 
-  LTTV_FILTER_TRACEFILE = g_quark_from_string("tracefile"); 
+//  LTTV_FILTER_EVENT = g_quark_from_string("event"); 
+//  LTTV_FILTER_TRACE = g_quark_from_string("trace"); 
+//  LTTV_FILTER_TRACESET = g_quark_from_string("traceset"); 
+//  LTTV_FILTER_STATE = g_quark_from_string("state"); 
+//  LTTV_FILTER_TRACEFILE = g_quark_from_string("tracefile"); 
  
   /* event.name, tracefile.name, trace.name */
-  LTTV_FILTER_NAME = g_quark_from_string("name");
+//  LTTV_FILTER_NAME = g_quark_from_string("name");
 
   /* event sub fields */
-  LTTV_FILTER_CATEGORY = g_quark_from_string("category"); 
-  LTTV_FILTER_TIME = g_quark_from_string("time"); 
-  LTTV_FILTER_TSC = g_quark_from_string("tsc"); 
+//  LTTV_FILTER_CATEGORY = g_quark_from_string("category"); 
+//  LTTV_FILTER_TIME = g_quark_from_string("time"); 
+//  LTTV_FILTER_TSC = g_quark_from_string("tsc"); 
 
   /* state sub fields */
-  LTTV_FILTER_PID = g_quark_from_string("pid"); 
-  LTTV_FILTER_PPID = g_quark_from_string("ppid"); 
-  LTTV_FILTER_C_TIME = g_quark_from_string("creation_time");  
-  LTTV_FILTER_I_TIME = g_quark_from_string("insertion_time"); 
-  LTTV_FILTER_P_NAME = g_quark_from_string("process_name"); 
-  LTTV_FILTER_EX_MODE = g_quark_from_string("execution_mode");  
-  LTTV_FILTER_EX_SUBMODE = g_quark_from_string("execution_submode");
-  LTTV_FILTER_P_STATUS = g_quark_from_string("process_status");
-  LTTV_FILTER_CPU = g_quark_from_string("cpu");
+//  LTTV_FILTER_PID = g_quark_from_string("pid"); 
+//  LTTV_FILTER_PPID = g_quark_from_string("ppid"); 
+//  LTTV_FILTER_C_TIME = g_quark_from_string("creation_time");  
+//  LTTV_FILTER_I_TIME = g_quark_from_string("insertion_time"); 
+//  LTTV_FILTER_P_NAME = g_quark_from_string("process_name"); 
+//  LTTV_FILTER_EX_MODE = g_quark_from_string("execution_mode");  
+//  LTTV_FILTER_EX_SUBMODE = g_quark_from_string("execution_submode");
+//  LTTV_FILTER_P_STATUS = g_quark_from_string("process_status");
+//  LTTV_FILTER_CPU = g_quark_from_string("cpu");
   
 }
 
This page took 0.031243 seconds and 4 git commands to generate.