X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=df3873f61b6e6fc0c29164259ec72a403c4b3ce7;hb=2b99ec1016af603586633c23f1e68aca44a345d7;hp=7bfcc25951d49762d81ee4cb6fb0bf46a36ed3f7;hpb=f4e9dd16df04f26cdbe885ea7c9744d423fe6869;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 7bfcc259..df3873f6 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -28,6 +28,15 @@ * - 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 /* @@ -117,16 +126,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"); @@ -165,21 +201,25 @@ 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 */ + lttv_filter_tree + *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(""); @@ -199,79 +239,156 @@ 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;istr); +// 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 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1); + while(t1->right != LTTV_TREE_UNDEFINED) 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 { - 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 = 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_UNDEFINED) 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 */ + t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1); + while(t1->right != LTTV_TREE_UNDEFINED) 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_UNDEFINED) 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 */ - 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_UNDEFINED && 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_UNDEFINED) 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; /* @@ -310,13 +427,36 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) { } } - + 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_UNDEFINED) 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; + } /** @@ -326,9 +466,27 @@ 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(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;