projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stats hook error handling better
[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..567b54f0a797d7094f7e8a614e48fe2997848540 100644
(file)
--- a/
ltt/branches/poly/lttv/lttv/filter.c
+++ b/
ltt/branches/poly/lttv/lttv/filter.c
@@
-74,6
+74,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>
@@
-228,6
+229,9
@@
lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
se->field = LTTV_FILTER_EVENT_FIELD;
}
} else {
se->field = LTTV_FILTER_EVENT_FIELD;
}
} 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");
}
@@
-1254,6
+1258,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
+1338,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
+1372,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
+1406,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
+1420,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
+1480,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
+1497,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
+1510,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
+1523,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
+1542,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
+1600,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
+1618,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
+1815,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];
/*
This page took
0.02488 seconds
and
4
git commands to generate.