X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=6337cd2c89f9a6b69b62035d65c86e56e7dda6ab;hb=7b5f6cf19fe5b312dc0c5712b0fceddeed2fe11f;hp=4d02187291cf5d513973b535e4e18e787806eed8;hpb=87834cd1bb42866b0c6e65a0cf81e135da0c210e;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 4d021872..6337cd2c 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -36,11 +36,12 @@ * | |->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 @@ -51,6 +52,7 @@ * |->creation_time (LttTime) * |->insertion_time (LttTime) * |->process_name (String, converted to GQuark) + * |->thread_brand (String, converted to GQuark) * |->execution_mode (LttvExecutionMode) * |->execution_submode (LttvExecutionSubmode) * |->process_status (LttvProcessStatus) @@ -163,6 +165,7 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { * state.creation_time * state.insertion_time * state.process_name + * state.thread_brand * state.execution_mode * state.execution_submode * state.process_status @@ -185,6 +188,9 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { else if(!g_strcasecmp(f->str,"process_name") ) { se->field = LTTV_FILTER_STATE_P_NAME; } + else if(!g_strcasecmp(f->str,"thread_brand") ) { + se->field = LTTV_FILTER_STATE_T_BRAND; + } else if(!g_strcasecmp(f->str,"execution_mode") ) { se->field = LTTV_FILTER_STATE_EX_MODE; } @@ -204,6 +210,7 @@ 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); @@ -225,10 +232,20 @@ 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; + g_string_free(f,TRUE); + f=g_ptr_array_remove_index(fp,0); + + } else { + g_string_free(f,TRUE); + f=g_ptr_array_remove_index(fp,0); + 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"); } @@ -264,6 +281,7 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO case LTTV_FILTER_TRACE_NAME: case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: + case LTTV_FILTER_STATE_T_BRAND: case LTTV_FILTER_EVENT_NAME: case LTTV_FILTER_EVENT_FACILITY: case LTTV_FILTER_STATE_EX_MODE: @@ -424,13 +442,14 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { case LTTV_FILTER_TRACE_NAME: case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: + case LTTV_FILTER_STATE_T_BRAND: 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; /* @@ -536,6 +555,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_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: @@ -654,8 +674,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); } /** @@ -767,7 +786,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); } @@ -1255,6 +1274,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 */ @@ -1334,6 +1354,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(); @@ -1366,6 +1388,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(); @@ -1398,6 +1422,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(); @@ -1410,6 +1436,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 { /* ! */ @@ -1468,6 +1496,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(); @@ -1483,6 +1513,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); @@ -1494,6 +1526,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); @@ -1505,6 +1539,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; @@ -1522,13 +1558,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]); } } @@ -1568,6 +1616,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; @@ -1584,7 +1634,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); @@ -1780,8 +1831,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]; /* @@ -1892,15 +1944,19 @@ lttv_filter_tree_parse_branch( } break; case LTTV_FILTER_STATE_P_NAME: - /* - * All 'unnamed' for the moment - */ if(state == NULL) return TRUE; else { GQuark quark = state->name; return se->op((gpointer)&quark,v); } break; + case LTTV_FILTER_STATE_T_BRAND: + if(state == NULL) return TRUE; + else { + GQuark quark = state->brand; + return se->op((gpointer)&quark,v); + } + break; case LTTV_FILTER_STATE_EX_MODE: if(state == NULL) return TRUE; else return se->op((gpointer)&state->state->t,v); @@ -1916,9 +1972,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); }