X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=697779a60c30246a0443c9cc146b7d85dd626526;hb=44c0619eb20fb7e34b3ec088219fe6d3c05cec75;hp=6b42249e8a4ac03122941deadd1fb3d59bd801a2;hpb=4ec0c90410f2c28ec11fc20a0acf28ce30a97950;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 6b42249e..697779a6 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -35,6 +35,7 @@ * | |->category (String, not yet implemented) * | |->time (LttTime) * | |->tsc (LttCycleCount --> uint64) + * | |->target_pid (target PID of the event) * | |->fields * | |->"facility_name * | |->"event name" @@ -210,6 +211,7 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { * event.category * event.time * event.tsc + * event.target_pid * event.field */ g_string_free(f,TRUE); @@ -232,6 +234,9 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { else if(!g_strcasecmp(f->str,"tsc") ) { se->field = LTTV_FILTER_EVENT_TSC; } + else if(!g_strcasecmp(f->str,"target_pid") ) { + se->field = LTTV_FILTER_EVENT_TARGET_PID; + } else if(!g_strcasecmp(f->str,"field") ) { se->field = LTTV_FILTER_EVENT_FIELD; g_string_free(f,TRUE); @@ -333,6 +338,7 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO case LTTV_FILTER_STATE_CPU: case LTTV_FILTER_STATE_PID: case LTTV_FILTER_STATE_PPID: + case LTTV_FILTER_EVENT_TARGET_PID: switch(op) { case LTTV_FIELD_EQ: se->op = lttv_apply_op_eq_uint; @@ -433,6 +439,7 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { gboolean is_double = FALSE; LttTime t = ltt_time_zero; GString* v; + guint string_len; switch(se->field) { /* @@ -465,6 +472,7 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { case LTTV_FILTER_STATE_PID: case LTTV_FILTER_STATE_PPID: case LTTV_FILTER_STATE_CPU: + case LTTV_FILTER_EVENT_TARGET_PID: se->value.v_uint = atoi(value); g_free(value); break; @@ -480,7 +488,8 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { * but as for now, simpler this way */ v = g_string_new(""); - for(i=0;istr); - else t.tv_sec = atoi(v->str); + else { + t.tv_sec = atoi(v->str); + t.tv_nsec = 0; + } g_string_free(v,TRUE); @@ -555,7 +567,7 @@ lttv_struct_type(gint ft) { case LTTV_FILTER_STATE_CT: case LTTV_FILTER_STATE_IT: case LTTV_FILTER_STATE_P_NAME: - case LTTV_FILTER_STATE_T_BRAND: + case LTTV_FILTER_STATE_T_BRAND: case LTTV_FILTER_STATE_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: @@ -567,6 +579,7 @@ lttv_struct_type(gint ft) { case LTTV_FILTER_EVENT_CATEGORY: case LTTV_FILTER_EVENT_TIME: case LTTV_FILTER_EVENT_TSC: + case LTTV_FILTER_EVENT_TARGET_PID: case LTTV_FILTER_EVENT_FIELD: return LTTV_FILTER_EVENT; break; @@ -1194,7 +1207,7 @@ lttv_filter_tree_clone(const LttvFilterTree* tree) { LttvFilter* lttv_filter_clone(const LttvFilter* filter) { - if(!filter) return NULL; + if(!filter) return NULL; LttvFilter* newfilter = g_new(LttvFilter,1); @@ -1210,8 +1223,8 @@ lttv_filter_clone(const LttvFilter* filter) { /** * @fn LttvFilter* lttv_filter_new() * - * Creates a new LttvFilter - * @return the current LttvFilter or NULL if error + * Creates a new LttvFilter + * @return the current LttvFilter or NULL if error */ LttvFilter* lttv_filter_new() { @@ -1235,14 +1248,15 @@ lttv_filter_new() { gboolean lttv_filter_update(LttvFilter* filter) { -// g_print("filter::lttv_filter_new()\n"); /* debug */ +// g_print("filter::lttv_filter_new()\n"); /* debug */ if(filter->expression == NULL) return FALSE; - int + int i, - p_nesting=0, /* parenthesis nesting value */ + p_nesting=0, /* parenthesis nesting value */ not=0; + guint expression_len; /* trees */ LttvFilterTree @@ -1279,19 +1293,21 @@ lttv_filter_update(LttvFilter* filter) { /* simple expression buffer */ LttvSimpleExpression* a_simple_expression = lttv_simple_expression_new(); + + gint nest_quotes = 0; /* - * Parse entire expression and construct - * the binary tree. There are two steps - * in browsing that string - * 1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} " - * 2. finding simple expressions - * - field path ( separated by dots ) - * - op ( >, <, =, >=, <=, !=) - * - value ( integer, string ... ) - * To spare computing time, the whole - * string is parsed in this loop for a - * O(n) complexity order. + * Parse entire expression and construct + * the binary tree. There are two steps + * in browsing that string + * 1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} " + * 2. finding simple expressions + * - field path ( separated by dots ) + * - op ( >, <, =, >=, <=, !=) + * - value ( integer, string ... ) + * 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 @@ -1317,10 +1333,32 @@ lttv_filter_update(LttvFilter* filter) { gettimeofday(&starttime, NULL); #endif - for(i=0;iexpression);i++) { + expression_len = strlen(filter->expression); + for(i=0;iexpression[i]); - + if(nest_quotes) { + switch(filter->expression[i]) { + case '\\' : + if(filter->expression[i+1] == '\"') { + i++; + } + break; + case '\"': + nest_quotes = 0; + i++; + break; + } + if(a_string_spaces->len != 0) { + a_field_component = 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]); + continue; + } + switch(filter->expression[i]) { /* * logical operators @@ -1354,8 +1392,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(""); + 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(); @@ -1388,8 +1426,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(""); + 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(); @@ -1422,8 +1460,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(""); + 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(); @@ -1436,8 +1474,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(""); + 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 { /* ! */ @@ -1468,7 +1506,7 @@ lttv_filter_update(LttvFilter* filter) { 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",filter->expression); + is not valid due to parenthesis incorrect use",filter->expression); return FALSE; } @@ -1496,8 +1534,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(""); + 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(); @@ -1505,16 +1543,16 @@ lttv_filter_update(LttvFilter* filter) { } break; - /* - * mathematic operators + /* + * mathematic operators */ case '<': /* lower, lower or equal */ 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(""); + 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); @@ -1526,8 +1564,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(""); + 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); @@ -1539,8 +1577,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(""); + 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; @@ -1558,26 +1596,32 @@ 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(""); + g_string_free(a_string_spaces, TRUE); + a_string_spaces = g_string_new(""); + } else { + /* Operator found, we are in the value field */ + g_string_append_c(a_field_component, filter->expression[i]); } break; 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]); + 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; + case '\"': + nest_quotes?(nest_quotes=0):(nest_quotes=1); + break; default: /* concatening current string */ - if(a_string_spaces->len != 0) { - a_field_component = g_string_append( + if(a_string_spaces->len != 0) { + a_field_component = 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]); + a_string_spaces = g_string_set_size(a_string_spaces, 0); + } + a_field_component = g_string_append_c(a_field_component, + filter->expression[i]); } } @@ -1587,7 +1631,7 @@ lttv_filter_update(LttvFilter* filter) { */ if( p_nesting>0 ) { g_warning("Wrong filtering options, the string\n\"%s\"\n\ - is not valid due to parenthesis incorrect use",filter->expression); + is not valid due to parenthesis incorrect use",filter->expression); return FALSE; } @@ -1617,8 +1661,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; + 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; @@ -1635,7 +1679,7 @@ 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); + 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); @@ -1672,12 +1716,12 @@ lttv_filter_update(LttvFilter* filter) { void lttv_filter_destroy(LttvFilter* filter) { - if(!filter) return; + if(!filter) return; - if(filter->expression) - g_free(filter->expression); - if(filter->head) - lttv_filter_tree_destroy(filter->head); + if(filter->expression) + g_free(filter->expression); + if(filter->head) + lttv_filter_tree_destroy(filter->head); g_free(filter); } @@ -1789,7 +1833,9 @@ lttv_filter_tree_parse( const LttEvent* event, const LttTracefile* tracefile, const LttTrace* trace, - const LttvTracefileContext* context + const LttvTracefileContext* context, + const LttvProcessState* state, + const LttvTraceContext* tc /*,...*/) { @@ -1830,18 +1876,24 @@ lttv_filter_tree_parse( gboolean lresult = FALSE, rresult = FALSE; - LttvProcessState* state; - - LttvTraceState *ts = (LttvTraceState*)context->t_context; + LttvTraceState *ts; LttvTracefileState *tfs = (LttvTracefileState*)context; - guint cpu = tfs->cpu; - state = ts->running_process[cpu]; + if(tc) + ts = (LttvTraceState*)tc; + else if(context) + ts = (LttvTraceState*)context->t_context; + + if(tfs) { + guint cpu = tfs->cpu; + if(ts) + state = ts->running_process[cpu]; + } /* * Parse left branch */ if(t->left == LTTV_TREE_NODE) { - lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,context); + lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,context,NULL,NULL); } else if(t->left == LTTV_TREE_LEAF) { lresult = lttv_filter_tree_parse_branch(t->l_child.leaf,event,tracefile,trace,state,context); @@ -1858,7 +1910,7 @@ lttv_filter_tree_parse( * Parse right branch */ if(t->right == LTTV_TREE_NODE) { - rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,context); + rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,context,NULL,NULL); } else if(t->right == LTTV_TREE_LEAF) { rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context); @@ -1951,7 +2003,7 @@ lttv_filter_tree_parse_branch( return se->op((gpointer)&quark,v); } break; - case LTTV_FILTER_STATE_T_BRAND: + case LTTV_FILTER_STATE_T_BRAND: if(state == NULL) return TRUE; else { GQuark quark = state->brand; @@ -1971,10 +2023,9 @@ lttv_filter_tree_parse_branch( else return se->op((gpointer)&state->state->s,v); break; case LTTV_FILTER_STATE_CPU: - if(context == NULL) return TRUE; + if(state == NULL) return TRUE; else { - if(state == NULL) return TRUE; - else return se->op((gpointer)&state->cpu,v); + return se->op((gpointer)&state->cpu,v); } break; case LTTV_FILTER_EVENT_NAME: @@ -2015,6 +2066,14 @@ lttv_filter_tree_parse_branch( return se->op((gpointer)&count,v); } break; + case LTTV_FILTER_EVENT_TARGET_PID: + if(context == NULL) return TRUE; + else { + guint target_pid = + lttv_state_get_target_pid((LttvTracefileState*)context); + return se->op((gpointer)&target_pid,v); + } + break; case LTTV_FILTER_EVENT_FIELD: /* * TODO: Use the offset to