* | |->category (String, not yet implemented)
* | |->time (LttTime)
* | |->tsc (LttCycleCount --> uint64)
+ * | |->target_pid (target PID of the event)
* | |->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
* |->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)
#include <lttv/lttv.h>
#include <lttv/filter.h>
#include <ltt/trace.h>
-#include <ltt/type.h>
-#include <ltt/facility.h>
#include <stdlib.h>
#include <string.h>
* state.creation_time
* state.insertion_time
* state.process_name
+ * state.thread_brand
* state.execution_mode
* state.execution_submode
* state.process_status
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;
}
* event.category
* event.time
* event.tsc
+ * event.target_pid
+ * event.field
*/
g_string_free(f,TRUE);
f=g_ptr_array_remove_index(fp,0);
if(!g_strcasecmp(f->str,"name") ) {
se->field = LTTV_FILTER_EVENT_NAME;
}
- else if(!g_strcasecmp(f->str,"facility") ) {
- se->field = LTTV_FILTER_EVENT_FACILITY;
- }
else if(!g_strcasecmp(f->str,"category") ) {
/*
* FIXME: Category not yet functional in lttv
else if(!g_strcasecmp(f->str,"tsc") ) {
se->field = LTTV_FILTER_EVENT_TSC;
}
- else { /* core.xml specified options */
+ 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);
+ 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);
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:
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;
gboolean is_double = FALSE;
LttTime t = ltt_time_zero;
GString* v;
+ guint string_len;
switch(se->field) {
/*
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;
/*
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;
* but as for now, simpler this way
*/
v = g_string_new("");
- for(i=0;i<strlen(value);i++) {
+ string_len = strlen(value);
+ for(i=0;i<string_len;i++) {
if(value[i] == '.') {
/* cannot specify number with more than one '.' */
if(is_double) return FALSE;
t.tv_sec = atoi(v->str);
g_string_free(v,TRUE);
v = g_string_new("");
- } else g_string_append_c(v,value[i]);
+ } else v = g_string_append_c(v,value[i]);
}
/* number can be integer or double */
if(is_double) t.tv_nsec = atoi(v->str);
- else t.tv_sec = atoi(v->str);
+ else {
+ t.tv_sec = atoi(v->str);
+ t.tv_nsec = 0;
+ }
g_string_free(v,TRUE);
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:
return LTTV_FILTER_STATE;
break;
case LTTV_FILTER_EVENT_NAME:
- case LTTV_FILTER_EVENT_FACILITY:
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;
*/
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);
}
/**
*/
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);
}
LttvFilter*
lttv_filter_clone(const LttvFilter* filter) {
- if(!filter) return NULL;
+ if(!filter) return NULL;
LttvFilter* newfilter = g_new(LttvFilter,1);
/**
* @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() {
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
/* 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
gettimeofday(&starttime, NULL);
#endif
- for(i=0;i<strlen(filter->expression);i++) {
+ expression_len = strlen(filter->expression);
+ for(i=0;i<expression_len;i++) {
// debug
// g_print("%c\n ",filter->expression[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
} 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();
} 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();
} 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();
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 { /* ! */
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;
}
} 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();
}
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);
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);
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;
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) {
- 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]);
+ 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]);
}
}
*/
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;
}
} 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;
/* 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);
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);
}
GString* s = g_string_new("");
if(filter->expression != NULL) {
- g_string_append(s,filter->expression);
- g_string_append_c(s,'&');
+ s = g_string_append(s,filter->expression);
+ s = g_string_append_c(s,'&');
}
- g_string_append(s,expression);
+ s = g_string_append(s,expression);
g_free(filter->expression);
filter->expression = g_string_free(s,FALSE);
const LttEvent* event,
const LttTracefile* tracefile,
const LttTrace* trace,
- const LttvTracefileContext* context
+ const LttvTracefileContext* context,
+ const LttvProcessState* state,
+ const LttvTraceContext* tc
/*,...*/)
{
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);
* 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);
}
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);
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 {
- /* 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);
+ return se->op((gpointer)&state->cpu,v);
}
break;
case LTTV_FILTER_EVENT_NAME:
if(event == NULL) return TRUE;
else {
- LttEventType* et;
- et = ltt_event_eventtype(event);
- GQuark quark = ltt_eventtype_name(et);
- return se->op((gpointer)&quark,v);
- }
- break;
- case LTTV_FILTER_EVENT_FACILITY:
- if(event == NULL) return TRUE;
- else {
- LttFacility* fac;
- fac = ltt_event_facility(event);
- GQuark quark = ltt_facility_name(fac);
+ struct marker_info *info;
+ info = marker_get_info_from_id((LttTrace *)trace, event->event_id);
+ g_assert(info != NULL);
+ GQuark quark = info->name;
return se->op((gpointer)&quark,v);
}
break;
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
projects / lttv.git / blobdiff