filter core:
[lttv.git] / ltt / branches / poly / lttv / lttv / filter.c
index 62092a2546b4b707acce655120a055e20e3c7746..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 
- */
-
-/*
- *  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>
-
 /*
   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,
@@ -79,65 +78,25 @@ GQuark
   LTTV_FILTER_EX_SUBMODE,
   LTTV_FILTER_P_STATUS,
   LTTV_FILTER_CPU;
+*/
 
-lttv_simple_expression* 
+LttvSimpleExpression* 
 lttv_simple_expression_new() {
 
 }
-
-/**
- *  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 = 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
+ * 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);
-}
-
-lttv_filter*
-lttv_filter_clone(lttv_filter* tree) {
-
-    lttv_filter* newtree = lttv_filter_tree_new();
-
-    /*
-     * TODO : Copy tree into new tree
-     */
-    
-    return newtree;
-    
-}
-
 void
-lttv_filter_tree_add_node(GPtrArray* stack, lttv_filter_tree* subtree, lttv_logical_op op) {
+lttv_filter_tree_add_node(GPtrArray* stack, LttvFilterTree* subtree, LttvLogicalOp op) {
 
-  lttv_filter_tree* t1 = NULL;
-  lttv_filter_tree* t2 = NULL;;
+  LttvFilterTree* t1 = NULL;
+  LttvFilterTree* t2 = NULL;
 
-  t1 = (lttv_filter_tree*)g_ptr_array_index(stack,stack->len-1);
+  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;
@@ -230,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 */
@@ -247,7 +422,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
     b=0;       /* current breakpoint in expression string */
 
   /* trees */
-  lttv_filter_tree
+  LttvFilterTree
     *tree = lttv_filter_tree_new(),   /* main tree */
     *subtree = NULL,                  /* buffer for subtrees */
     *t1,                              /* buffer #1 */
@@ -269,7 +444,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
   GString *a_field_component = g_string_new(""); 
   GPtrArray *a_field_path = NULL;
     
-  lttv_simple_expression* a_simple_expression = g_new(lttv_simple_expression,1);
+  LttvSimpleExpression* a_simple_expression = g_new(LttvSimpleExpression,1);
   
   /*
    *   Parse entire expression and construct
@@ -315,7 +490,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
        *   logical operators
        */
       case '&':   /* and */
-        t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+        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;
@@ -330,14 +505,14 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           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);
+          a_simple_expression = g_new(LttvSimpleExpression,1);
           t1->right = LTTV_TREE_NODE;
           t1->r_child.t = t2; 
         }
         
         break;
       case '|':   /* or */
-        t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+        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;
@@ -352,13 +527,13 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           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);
+          a_simple_expression = g_new(LttvSimpleExpression,1);
           t1->right = LTTV_TREE_NODE;
           t1->r_child.t = t2; 
         }
         break;
       case '^':   /* xor */
-        t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+        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;
@@ -373,7 +548,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           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);
+          a_simple_expression = g_new(LttvSimpleExpression,1);
           t1->right = LTTV_TREE_NODE;
           t1->r_child.t = t2; 
         }
@@ -387,7 +562,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
         } else {  /* ! */
         //  g_print("%s\n",a_field_component);
         //  a_field_component = g_string_new("");
-          t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+          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;
@@ -430,7 +605,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
           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(lttv_simple_expression,1);
+          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);
@@ -501,7 +676,11 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
     a_field_component = g_string_new("");
     t1->right = LTTV_TREE_LEAF;
     t1->r_child.leaf = a_simple_expression;
-    a_simple_expression = g_new(lttv_simple_expression,1);
+    /*
+     * FIXME: is it really necessary to reallocate 
+     *        LttvSimpleExpression at this point ??
+     */
+    a_simple_expression = g_new(LttvSimpleExpression,1);
   }
   
   g_assert(tree != NULL);
@@ -514,10 +693,46 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
 }
 
 void
-lttv_filter_destroy(lttv_filter* filter) {
+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
@@ -525,8 +740,10 @@ lttv_filter_destroy(lttv_filter* filter) {
  *     @return success/failure of operation
  */
 gboolean
-lttv_filter_tracefile(lttv_filter_tree *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 
@@ -538,17 +755,17 @@ lttv_filter_tracefile(lttv_filter_tree *filter, LttTracefile *tracefile) {
    *  managing an array of all items to be removed .. 
    */
   
-  g_print("node:%p lchild:%p rchild:%p\n",filter,filter->l_child.t,filter->r_child.t);
-  g_print("node type%i\n",filter->node);
-  if(filter->left == LTTV_TREE_NODE) lttv_filter_tracefile(filter->l_child.t,NULL);
-  else if(filter->left == LTTV_TREE_LEAF) {
-    g_assert(filter->l_child.leaf->value != NULL);
-    g_print("%p: left is qqch %i %s\n",filter,filter->l_child.leaf->op,filter->l_child.leaf->value);
+  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(filter->right == LTTV_TREE_NODE) lttv_filter_tracefile(filter->r_child.t,NULL);
-  else if(filter->right == LTTV_TREE_LEAF) {
-    g_assert(filter->r_child.leaf->value != NULL);
-    g_print("%p: right is qqch %i %s\n",filter,filter->r_child.leaf->op,filter->r_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 */
@@ -578,7 +795,7 @@ lttv_filter_tracefile(lttv_filter_tree *filter, LttTracefile *tracefile) {
 }
 
 gboolean
-lttv_filter_tracestate(lttv_filter_t *filter, LttvTraceState *tracestate) {
+lttv_filter_tracestate(LttvFilter *filter, LttvTraceState *tracestate) {
 
 }
 
@@ -589,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) {
 
 }
 
@@ -607,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.051194 seconds and 4 git commands to generate.