projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
partial fix
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
lttv
/
filter.c
diff --git
a/ltt/branches/poly/lttv/lttv/filter.c
b/ltt/branches/poly/lttv/lttv/filter.c
index a1cfc0dcbd6dc86e6196ba891c295073e5d199a4..78882d6966553603660c0caef24ae0f546cc7df6 100644
(file)
--- 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
* | |->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
* |->tracefile
* | |->name (String, converted to GQuark)
* |->trace
@@
-74,6
+75,7
@@
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
+#include <lttv/lttv.h>
#include <lttv/filter.h>
#include <ltt/trace.h>
#include <ltt/type.h>
#include <lttv/filter.h>
#include <ltt/trace.h>
#include <ltt/type.h>
@@
-203,6
+205,7
@@
lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
* event.category
* event.time
* event.tsc
* event.category
* event.time
* event.tsc
+ * event.field
*/
g_string_free(f,TRUE);
f=g_ptr_array_remove_index(fp,0);
*/
g_string_free(f,TRUE);
f=g_ptr_array_remove_index(fp,0);
@@
-224,10
+227,20
@@
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,"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;
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 {
}
} else {
+ g_string_free(f,TRUE);
+ f=g_ptr_array_remove_index(fp,0);
+
g_warning("Unrecognized field in filter string");
}
g_warning("Unrecognized field in filter string");
}
@@
-429,7
+442,7
@@
lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
case LTTV_FILTER_STATE_EX_SUBMODE:
case LTTV_FILTER_STATE_P_STATUS:
// se->value.v_string = value;
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;
/*
g_free(value);
break;
/*
@@
-653,8
+666,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;
*/
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);
}
/**
}
/**
@@
-766,7
+778,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;
*/
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
);
}
}
@@
-1254,6
+1266,7
@@
lttv_filter_update(LttvFilter* filter) {
/* temporary values */
GString *a_field_component = g_string_new("");
/* 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 */
GPtrArray *a_field_path = g_ptr_array_new();
/* simple expression buffer */
@@
-1333,6
+1346,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("");
} 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();
t2->left = LTTV_TREE_LEAF;
t2->l_child.leaf = a_simple_expression;
a_simple_expression = lttv_simple_expression_new();
@@
-1365,6
+1380,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("");
} 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();
t2->left = LTTV_TREE_LEAF;
t2->l_child.leaf = a_simple_expression;
a_simple_expression = lttv_simple_expression_new();
@@
-1397,6
+1414,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("");
} 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();
t2->left = LTTV_TREE_LEAF;
t2->l_child.leaf = a_simple_expression;
a_simple_expression = lttv_simple_expression_new();
@@
-1409,6
+1428,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_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 { /* ! */
lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_NE);
i++;
} else { /* ! */
@@
-1467,6
+1488,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("");
} 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();
t1->right = LTTV_TREE_LEAF;
t1->r_child.leaf = a_simple_expression;
a_simple_expression = lttv_simple_expression_new();
@@
-1482,6
+1505,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_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);
if(filter->expression[i+1] == '=') { /* <= */
i++;
lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_LE);
@@
-1493,6
+1518,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_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);
if(filter->expression[i+1] == '=') { /* >= */
i++;
lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_GE);
@@
-1504,6
+1531,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_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;
lttv_simple_expression_assign_operator(a_simple_expression,LTTV_FIELD_EQ);
break;
@@
-1521,13
+1550,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("");
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;
}
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 */
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]);
}
}
}
}
@@
-1567,6
+1608,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;
} 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;
t1->right = LTTV_TREE_LEAF;
t1->r_child.leaf = a_simple_expression;
a_simple_expression = NULL;
@@
-1583,7
+1626,8
@@
lttv_filter_update(LttvFilter* filter) {
/* free the field buffer if allocated */
if(a_field_component != NULL) g_string_free(a_field_component,TRUE);
/* 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);
/* free the simple expression buffer if allocated */
if(a_simple_expression != NULL) lttv_simple_expression_destroy(a_simple_expression);
@@
-1779,8
+1823,9
@@
lttv_filter_tree_parse(
LttvProcessState* state;
LttvProcessState* state;
- guint cpu = ltt_tracefile_num(context->tf);
LttvTraceState *ts = (LttvTraceState*)context->t_context;
LttvTraceState *ts = (LttvTraceState*)context->t_context;
+ LttvTracefileState *tfs = (LttvTracefileState*)context;
+ guint cpu = tfs->cpu;
state = ts->running_process[cpu];
/*
state = ts->running_process[cpu];
/*
@@
-1915,9
+1960,6
@@
lttv_filter_tree_parse_branch(
case LTTV_FILTER_STATE_CPU:
if(context == NULL) return TRUE;
else {
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);
}
if(state == NULL) return TRUE;
else return se->op((gpointer)&state->cpu,v);
}
This page took
0.02591 seconds
and
4
git commands to generate.