/*
* YET TO BE ANSWERED
- * - nothing for now
+ * - the exists an other lttv_filter which conflicts with this one
+ */
+
+/*
+ * TODO
+ * - refine switch of expression in multiple uses functions
+ * - divide expression structure
+ * - a simple expression -> leaf
+ * - a logical operator -> node
+ * - add the current simple expression to the tree
*/
#include <lttv/filter.h>
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_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(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);
+}
/**
* Parse through filtering field hierarchy as specified
* @return success/failure of operation
*/
gboolean
-parse_field_path(GList* fp) {
+parse_field_path(GPtrArray* fp) {
- GString* f = g_list_first(fp)->data;
+ 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");
* @param t pointer to the current LttvTrace
* @return the current lttv_filter or NULL if error
*/
-lttv_filter_t*
+lttv_filter_tree*
lttv_filter_new(char *expression, LttvTraceState *tcs) {
g_print("filter::lttv_filter_new()\n"); /* debug */
i,
p_nesting=0, /* parenthesis nesting value */
b=0; /* current breakpoint in expression string */
-
- /* temporary values */
- GString *a_field_component = g_string_new("");
- GList *a_field_path = NULL;
- lttv_simple_expression a_simple_expression;
-
- /*
- * 1. parse expression
- * 2. construct binary tree
- * 3. return corresponding filter
- */
+
+ /* trees */
+ lttv_filter_tree
+ *tree = lttv_filter_tree_new(), /* main tree */
+ *subtree = NULL, /* buffer for subtrees */
+ *t1, /* buffer #1 */
+ *t2; /* buffer #2 */
/*
- * Binary tree memory allocation
- * - based upon a preliminary block size
+ * 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 left at the root of
+ * the list
*/
-// gulong size = (strlen(expression)/AVERAGE_EXPRESSION_LENGTH)*MAX_FACTOR;
-// tree = g_malloc(size*sizeof(lttv_filter_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;
+
/*
* Parse entire expression and construct
* the binary tree. There are two steps
* in browsing that string
- * 1. finding boolean ops ( &,|,^,! ) and parenthesis
+ * 1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} "
* 2. finding simple expressions
* - field path ( separated by dots )
* - op ( >, <, =, >=, <=, !=)
* 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 */
+ t1 = (lttv_filter_tree*)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->type = LTTV_EXPRESSION_OP;
+ t2->node->e.op = 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 {
+ a_simple_expression.value = a_field_component->str;
+ a_field_component = g_string_new("");
+ t2->left = LTTV_TREE_LEAF;
+ t2->l_child.leaf = g_new(lttv_simple_expression,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);
+ while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
+ t2 = lttv_filter_tree_new();
+ t2->node->type = LTTV_EXPRESSION_OP;
+ t2->node->e.op = 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 = g_new(lttv_simple_expression,1);
+ t1->right = LTTV_TREE_NODE;
+ t1->r_child.t = t2;
+ }
+ break;
case '^': /* xor */
- g_list_append( a_field_path, a_field_component );
- a_field_component = g_string_new("");
+ t1 = (lttv_filter_tree*)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->type = LTTV_EXPRESSION_OP;
+ t2->node->e.op = 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 = g_new(lttv_simple_expression,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;
i++;
} 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 = (lttv_filter_tree*)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->type = LTTV_EXPRESSION_OP;
+ t2->node->e.op = 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 */
+ 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;
+ }
+
+ 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 = g_new(lttv_simple_expression,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;
/*
case '<': /* lower, lower or equal */
if(expression[i+1] == '=') { /* <= */
i++;
- a_simple_expression.op = LTTV_FIELD_LE;
+ 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;
+ 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;
+ g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+ a_field_component = g_string_new("");
break;
/*
* Field concatening caracter
*/
case '.': /* dot */
- g_list_append( a_field_path, a_field_component );
+ g_ptr_array_add( a_field_path,(gpointer) a_field_component );
a_field_component = g_string_new("");
break;
default: /* concatening current string */
}
}
-
+ g_print("subtree:%p, tree:%p, t1:%p, t2:%p\n",subtree,tree,t1,t2);
+
+ /* processing last element of expression */
+ g_assert(tree_stack->len==1); /* only root tree should remain */
+ 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->l_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 = g_new(lttv_simple_expression,1);
+ }
+
+ g_assert(tree != NULL);
+ g_assert(subtree == NULL);
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;
}
+
+ lttv_filter_tracefile(tree,NULL);
+
+ return tree;
+
}
/**
* @return success/failure of operation
*/
gboolean
-lttv_filter_tracefile(lttv_filter_t *filter, LttTracefile *tracefile) {
+lttv_filter_tracefile(lttv_filter_tree *filter, LttTracefile *tracefile) {
+ /*
+ * 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",filter,filter->l_child.t,filter->r_child.t);
+ if(filter->node->type == LTTV_EXPRESSION_OP) {
+ g_print("node type%i\n",filter->node->e.op);
+ }
+ if(filter->left == LTTV_TREE_NODE) lttv_filter_tracefile(filter->l_child.t,NULL);
+ else g_print("%p: left is %i\n",filter,filter->left);
+ if(filter->right == LTTV_TREE_NODE) lttv_filter_tracefile(filter->r_child.t,NULL);
+ else g_print("%p: right is %i\n",filter,filter->right);
/* test */
/* int i, nb;
projects / lttv.git / blobdiff