X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=4025e4da5d8494d024228ac343e7016445c5410d;hb=32095bb44a4d8f8a3f7c8081462ceaa77a6a9a89;hp=8ab84717ecb58e5dd7f7f80f701ffa847073ac7f;hpb=2ec1108718829d9148d9b26f47aeac2f802095ca;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 8ab84717..4025e4da 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -31,15 +31,17 @@ * LttvTracefileContext{} * |->event\ * | |->name (String, converted to GQuark) + * | |->facility (String, converted to GQuark) * | |->category (String, not yet implemented) * | |->time (LttTime) * | |->tsc (LttCycleCount --> uint64) * | |->fields - * | |->"event name" - * | |->"field name" - * | |->"sub-field name" - * | |->... - * | |->"leaf-field name" (field type) + * | |->"facility_name + * | |->"event name" + * | |->"field name" + * | |->"sub-field name" + * | |->... + * | |->"leaf-field name" (field type) * |->tracefile * | |->name (String, converted to GQuark) * |->trace @@ -73,9 +75,11 @@ #include #endif +#include #include #include #include +#include #include #include @@ -201,12 +205,16 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { * event.category * event.time * event.tsc + * event.field */ g_string_free(f,TRUE); f=g_ptr_array_remove_index(fp,0); if(!g_strcasecmp(f->str,"name") ) { se->field = LTTV_FILTER_EVENT_NAME; } + else if(!g_strcasecmp(f->str,"facility") ) { + se->field = LTTV_FILTER_EVENT_FACILITY; + } else if(!g_strcasecmp(f->str,"category") ) { /* * FIXME: Category not yet functional in lttv @@ -219,10 +227,16 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { else if(!g_strcasecmp(f->str,"tsc") ) { se->field = LTTV_FILTER_EVENT_TSC; } - else { /* core.xml specified options */ + else if(!g_strcasecmp(f->str,"field") ) { se->field = LTTV_FILTER_EVENT_FIELD; + + } else { + g_warning("Unknown event filter subtype %s", f->str); } } else { + g_string_free(f,TRUE); + f=g_ptr_array_remove_index(fp,0); + g_warning("Unrecognized field in filter string"); } @@ -259,6 +273,7 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: case LTTV_FILTER_EVENT_NAME: + case LTTV_FILTER_EVENT_FACILITY: case LTTV_FILTER_STATE_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: @@ -418,11 +433,12 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: case LTTV_FILTER_EVENT_NAME: + case LTTV_FILTER_EVENT_FACILITY: case LTTV_FILTER_STATE_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: // se->value.v_string = value; - se->value.v_uint32 = g_quark_from_string(value); + se->value.v_quark = g_quark_from_string(value); g_free(value); break; /* @@ -535,6 +551,7 @@ lttv_struct_type(gint ft) { return LTTV_FILTER_STATE; break; case LTTV_FILTER_EVENT_NAME: + case LTTV_FILTER_EVENT_FACILITY: case LTTV_FILTER_EVENT_CATEGORY: case LTTV_FILTER_EVENT_TIME: case LTTV_FILTER_EVENT_TSC: @@ -645,8 +662,7 @@ gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) { */ gboolean lttv_apply_op_eq_quark(const gpointer v1, LttvFieldValue v2) { GQuark* r = (GQuark*) v1; -// g_print("v1:%i v2:%i\n",*r,v2.v_uint32); - return (*r == v2.v_uint32); + return (*r == v2.v_quark); } /** @@ -758,7 +774,7 @@ gboolean lttv_apply_op_ne_string(const gpointer v1, LttvFieldValue v2) { */ gboolean lttv_apply_op_ne_quark(const gpointer v1, LttvFieldValue v2) { GQuark* r = (GQuark*) v1; - return (*r != v2.v_uint32); + return (*r != v2.v_quark); } @@ -1246,6 +1262,7 @@ lttv_filter_update(LttvFilter* filter) { /* temporary values */ GString *a_field_component = g_string_new(""); + GString *a_string_spaces = g_string_new(""); GPtrArray *a_field_path = g_ptr_array_new(); /* simple expression buffer */ @@ -1325,6 +1342,8 @@ lttv_filter_update(LttvFilter* filter) { } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); @@ -1357,6 +1376,8 @@ lttv_filter_update(LttvFilter* filter) { } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); @@ -1389,6 +1410,8 @@ lttv_filter_update(LttvFilter* filter) { } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); @@ -1401,6 +1424,8 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_add( a_field_path,(gpointer) a_field_component ); lttv_simple_expression_assign_field(a_field_path,a_simple_expression); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_NE); i++; } else { /* ! */ @@ -1459,6 +1484,8 @@ lttv_filter_update(LttvFilter* filter) { } else { /* assign subtree as current tree */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); t1->right = LTTV_TREE_LEAF; t1->r_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); @@ -1474,6 +1501,8 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_add( a_field_path,(gpointer) a_field_component ); lttv_simple_expression_assign_field(a_field_path,a_simple_expression); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); if(filter->expression[i+1] == '=') { /* <= */ i++; lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_LE); @@ -1485,6 +1514,8 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_add( a_field_path,(gpointer) a_field_component ); lttv_simple_expression_assign_field(a_field_path,a_simple_expression); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); if(filter->expression[i+1] == '=') { /* >= */ i++; lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_GE); @@ -1496,6 +1527,8 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_add( a_field_path,(gpointer) a_field_component ); lttv_simple_expression_assign_field(a_field_path,a_simple_expression); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_EQ); break; @@ -1513,13 +1546,25 @@ lttv_filter_update(LttvFilter* filter) { if(a_simple_expression->field == LTTV_FILTER_UNDEFINED) { g_ptr_array_add( a_field_path,(gpointer) a_field_component ); a_field_component = g_string_new(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); } break; - case ' ': /* ignore */ + case ' ': /* keep spaces that are within a field component */ + if(a_field_component->len == 0) break; /* ignore */ + else + a_string_spaces = g_string_append_c(a_string_spaces, + filter->expression[i]); + case '\n': /* ignore */ break; default: /* concatening current string */ - g_string_append_c(a_field_component,filter->expression[i]); + if(a_string_spaces->len != 0) { + g_string_append(a_field_component, a_string_spaces->str); + a_string_spaces = g_string_set_size(a_string_spaces, 0); + } + a_field_component = g_string_append_c(a_field_component, + filter->expression[i]); } } @@ -1559,6 +1604,8 @@ lttv_filter_update(LttvFilter* filter) { } else { /* add a leaf */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); a_field_component = NULL; + g_string_free(a_string_spaces, TRUE); + a_string_spaces = NULL; t1->right = LTTV_TREE_LEAF; t1->r_child.leaf = a_simple_expression; a_simple_expression = NULL; @@ -1575,7 +1622,8 @@ lttv_filter_update(LttvFilter* filter) { /* free the field buffer if allocated */ if(a_field_component != NULL) g_string_free(a_field_component,TRUE); - + if(a_string_spaces != NULL) g_string_free(a_string_spaces, TRUE); + /* free the simple expression buffer if allocated */ if(a_simple_expression != NULL) lttv_simple_expression_destroy(a_simple_expression); @@ -1593,9 +1641,9 @@ lttv_filter_update(LttvFilter* filter) { #endif /* debug */ - g_print("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n"); + g_debug("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n"); lttv_print_tree(filter->head,0) ; - g_print("+++++++++++++++ END PRINT ++++++++++++++++++\n"); + g_debug("+++++++++++++++ END PRINT ++++++++++++++++++\n"); /* success */ return TRUE; @@ -1771,8 +1819,9 @@ lttv_filter_tree_parse( LttvProcessState* state; - guint cpu = ltt_tracefile_num(context->tf); LttvTraceState *ts = (LttvTraceState*)context->t_context; + LttvTracefileState *tfs = (LttvTracefileState*)context; + guint cpu = tfs->cpu; state = ts->running_process[cpu]; /* @@ -1907,9 +1956,6 @@ lttv_filter_tree_parse_branch( case LTTV_FILTER_STATE_CPU: if(context == NULL) return TRUE; else { - /* FIXME: not sure of that one Mathieu : fixed.*/ - // GQuark quark = ((LttvTracefileState*)context)->cpu_name; - // return se->op((gpointer)&quark,v); if(state == NULL) return TRUE; else return se->op((gpointer)&state->cpu,v); } @@ -1923,7 +1969,15 @@ lttv_filter_tree_parse_branch( return se->op((gpointer)&quark,v); } break; - + case LTTV_FILTER_EVENT_FACILITY: + if(event == NULL) return TRUE; + else { + LttFacility* fac; + fac = ltt_event_facility(event); + GQuark quark = ltt_facility_name(fac); + return se->op((gpointer)&quark,v); + } + break; case LTTV_FILTER_EVENT_CATEGORY: /* * TODO: Not yet implemented @@ -1975,22 +2029,22 @@ lttv_filter_tree_parse_branch( void lttv_print_tree(const LttvFilterTree* t, const int count) { - g_print("node:%p lchild:%p rchild:%p depth:%i\n",t, //t->l_child.t,t->r_child.t); + g_debug("node:%p lchild:%p rchild:%p depth:%i\n",t, //t->l_child.t,t->r_child.t); (t->left==LTTV_TREE_NODE)?t->l_child.t:NULL, (t->right==LTTV_TREE_NODE)?t->r_child.t:NULL, count); - g_print("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE")))); - g_print("|-> left branch %p is a %s\n",t->l_child.t,(t->left==LTTV_TREE_NODE)?"NODE":((t->left==LTTV_TREE_LEAF)?"LEAF":"IDLE")); + g_debug("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE")))); + g_debug("|-> left branch %p is a %s\n",t->l_child.t,(t->left==LTTV_TREE_NODE)?"NODE":((t->left==LTTV_TREE_LEAF)?"LEAF":"IDLE")); if(t->left == LTTV_TREE_LEAF) { - g_print("| |-> field type number: %i\n",t->l_child.leaf->field); - g_print("| |-> offset is: %i\n",t->l_child.leaf->offset); - g_print("| |-> operator function is: %p\n",t->l_child.leaf->op); + g_debug("| |-> field type number: %i\n",t->l_child.leaf->field); + g_debug("| |-> offset is: %i\n",t->l_child.leaf->offset); + g_debug("| |-> operator function is: %p\n",t->l_child.leaf->op); } - g_print("|-> right branch %p is a %s\n",t->r_child.t,(t->right==LTTV_TREE_NODE)?"NODE":((t->right==LTTV_TREE_LEAF)?"LEAF":"IDLE")); + g_debug("|-> right branch %p is a %s\n",t->r_child.t,(t->right==LTTV_TREE_NODE)?"NODE":((t->right==LTTV_TREE_LEAF)?"LEAF":"IDLE")); if(t->right == LTTV_TREE_LEAF) { - g_print("| |-> field type number: %i\n",t->r_child.leaf->field); - g_print("| |-> offset is: %i\n",t->r_child.leaf->offset); - g_print("| |-> operator function is: %p\n",t->r_child.leaf->op); + g_debug("| |-> field type number: %i\n",t->r_child.leaf->field); + g_debug("| |-> offset is: %i\n",t->r_child.leaf->offset); + g_debug("| |-> operator function is: %p\n",t->r_child.leaf->op); } if(t->left == LTTV_TREE_NODE) lttv_print_tree(t->l_child.t,count+1);