projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
float word order
[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 daa00769234964c14c9226f8764d1b46af5d75fd..06c8370c8f8ce960bfcc7f18f1bcc05f947f9993 100644
(file)
--- a/
ltt/branches/poly/lttv/lttv/filter.c
+++ b/
ltt/branches/poly/lttv/lttv/filter.c
@@
-63,6
+63,10
@@
* - remove the idle expressions in the tree
*/
* - remove the idle expressions in the tree
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
//#define TEST
#ifdef TEST
#include <time.h>
//#define TEST
#ifdef TEST
#include <time.h>
@@
-70,6
+74,9
@@
#endif
#include <lttv/filter.h>
#endif
#include <lttv/filter.h>
+#include <ltt/trace.h>
+#include <stdlib.h>
+#include <string.h>
/**
* @fn LttvSimpleExpression* lttv_simple_expression_new()
/**
* @fn LttvSimpleExpression* lttv_simple_expression_new()
@@
-105,7
+112,7
@@
lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) {
GString* f = NULL;
if(fp->len < 2) return FALSE;
GString* f = NULL;
if(fp->len < 2) return FALSE;
- g_assert(
f=g_ptr_array_remove_index(fp,0
));
+ g_assert(
(f=g_ptr_array_remove_index(fp,0)
));
/*
* Parse through the specified
/*
* Parse through the specified
@@
-372,7
+379,6
@@
lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
gboolean is_double = FALSE;
LttTime t = ltt_time_zero;
GString* v;
gboolean is_double = FALSE;
LttTime t = ltt_time_zero;
GString* v;
- GQuark quark;
switch(se->field) {
/*
switch(se->field) {
/*
@@
-417,14
+423,14
@@
lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
/* cannot specify number with more than one '.' */
if(is_double) return FALSE;
else is_double = TRUE;
/* cannot specify number with more than one '.' */
if(is_double) return FALSE;
else is_double = TRUE;
- t.tv_sec = atoi(v);
+ t.tv_sec = atoi(v
->str
);
g_string_free(v,TRUE);
v = g_string_new("");
} else g_string_append_c(v,value[i]);
}
/* number can be integer or double */
g_string_free(v,TRUE);
v = g_string_new("");
} else g_string_append_c(v,value[i]);
}
/* number can be integer or double */
- if(is_double) t.tv_nsec = atoi(v);
- else t.tv_sec = atoi(v);
+ if(is_double) t.tv_nsec = atoi(v
->str
);
+ else t.tv_sec = atoi(v
->str
);
g_string_free(v,TRUE);
g_string_free(v,TRUE);
@@
-1533,6
+1539,7
@@
lttv_filter_append_expression(LttvFilter* filter, const char *expression) {
if(expression == NULL) return FALSE;
if(filter == NULL) return FALSE;
if(expression == NULL) return FALSE;
if(filter == NULL) return FALSE;
+ if(expression[0] == '\0') return FALSE; /* Empty expression */
GString* s = g_string_new("");
if(filter->expression != NULL) {
GString* s = g_string_new("");
if(filter->expression != NULL) {
@@
-1722,16
+1729,14
@@
lttv_filter_tree_parse_branch(
case LTTV_FILTER_TRACE_NAME:
if(trace == NULL) return TRUE;
else {
case LTTV_FILTER_TRACE_NAME:
if(trace == NULL) return TRUE;
else {
- char* trace_name = ltt_trace_name(trace);
- GQuark quark = g_quark_from_string(trace_name);
+ GQuark quark = ltt_trace_name(trace);
return se->op((gpointer)&quark,v);
}
break;
case LTTV_FILTER_TRACEFILE_NAME:
if(tracefile == NULL) return TRUE;
else {
return se->op((gpointer)&quark,v);
}
break;
case LTTV_FILTER_TRACEFILE_NAME:
if(tracefile == NULL) return TRUE;
else {
- char* tracefile_name = ltt_tracefile_name(tracefile);
- GQuark quark = g_quark_from_string(tracefile_name);
+ GQuark quark = ltt_tracefile_name(tracefile);
return se->op((gpointer)&quark,v);
}
break;
return se->op((gpointer)&quark,v);
}
break;
@@
-1790,8
+1795,7
@@
lttv_filter_tree_parse_branch(
else {
LttEventType* et;
et = ltt_event_eventtype(event);
else {
LttEventType* et;
et = ltt_event_eventtype(event);
- char* event_name = ltt_eventtype_name(et);
- GQuark quark = g_quark_from_string(event_name);
+ GQuark quark = ltt_eventtype_name(et);
return se->op((gpointer)&quark,v);
}
break;
return se->op((gpointer)&quark,v);
}
break;
This page took
0.023335 seconds
and
4
git commands to generate.