X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=8ab84717ecb58e5dd7f7f80f701ffa847073ac7f;hb=565f24911d29ae5ca6bc096192df984fca27f902;hp=605a3d9f1bebf48b1b1aeb4028397f80d69df896;hpb=327a43149d62f1984112e1ef022ef039897f78ad;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 605a3d9f..8ab84717 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -45,15 +45,15 @@ * |->trace * | |->name (String, converted to GQuark) * |->state - * |->pid (uint64) - * |->ppid (uint64) + * |->pid (guint) + * |->ppid (guint) * |->creation_time (LttTime) * |->insertion_time (LttTime) * |->process_name (String, converted to GQuark) * |->execution_mode (LttvExecutionMode) * |->execution_submode (LttvExecutionSubmode) * |->process_status (LttvProcessStatus) - * |->cpu (GQuark) + * |->cpu (guint) * \endverbatim */ @@ -75,6 +75,7 @@ #include #include +#include #include #include @@ -258,7 +259,6 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: case LTTV_FILTER_EVENT_NAME: - case LTTV_FILTER_STATE_CPU: case LTTV_FILTER_STATE_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: @@ -277,8 +277,6 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO /* * integer */ - case LTTV_FILTER_STATE_PID: - case LTTV_FILTER_STATE_PPID: case LTTV_FILTER_EVENT_TSC: switch(op) { case LTTV_FIELD_EQ: @@ -304,6 +302,37 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO return FALSE; } break; + /* + * unsigned integers + */ + case LTTV_FILTER_STATE_CPU: + case LTTV_FILTER_STATE_PID: + case LTTV_FILTER_STATE_PPID: + switch(op) { + case LTTV_FIELD_EQ: + se->op = lttv_apply_op_eq_uint; + break; + case LTTV_FIELD_NE: + se->op = lttv_apply_op_ne_uint; + break; + case LTTV_FIELD_LT: + se->op = lttv_apply_op_lt_uint; + break; + case LTTV_FIELD_LE: + se->op = lttv_apply_op_le_uint; + break; + case LTTV_FIELD_GT: + se->op = lttv_apply_op_gt_uint; + break; + case LTTV_FIELD_GE: + se->op = lttv_apply_op_ge_uint; + break; + default: + g_warning("Error encountered in operator assignment"); + return FALSE; + } + break; + /* * Enums * Entered as string, converted to enum @@ -389,7 +418,6 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { case LTTV_FILTER_TRACEFILE_NAME: case LTTV_FILTER_STATE_P_NAME: case LTTV_FILTER_EVENT_NAME: - case LTTV_FILTER_STATE_CPU: case LTTV_FILTER_STATE_EX_MODE: case LTTV_FILTER_STATE_EX_SUBMODE: case LTTV_FILTER_STATE_P_STATUS: @@ -400,12 +428,19 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { /* * integer -- supposed to be uint64 */ - case LTTV_FILTER_STATE_PID: - case LTTV_FILTER_STATE_PPID: case LTTV_FILTER_EVENT_TSC: se->value.v_uint64 = atoi(value); g_free(value); break; + /* + * unsigned integers + */ + case LTTV_FILTER_STATE_PID: + case LTTV_FILTER_STATE_PPID: + case LTTV_FILTER_STATE_CPU: + se->value.v_uint = atoi(value); + g_free(value); + break; /* * LttTime */ @@ -423,14 +458,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; - 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 */ - 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); @@ -511,6 +546,22 @@ lttv_struct_type(gint ft) { } } +/** + * @fn gboolean lttv_apply_op_eq_uint(gpointer,LttvFieldValue) + * + * Applies the 'equal' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_eq_uint(const gpointer v1, LttvFieldValue v2) { + + guint* r = (guint*) v1; + return (*r == v2.v_uint); + +} + /** * @fn gboolean lttv_apply_op_eq_uint64(gpointer,LttvFieldValue) * @@ -612,6 +663,19 @@ gboolean lttv_apply_op_eq_ltttime(const gpointer v1, LttvFieldValue v2) { return ltt_time_compare(*r, v2.v_ltttime)==0?1:0; } +/** + * @fn gboolean lttv_apply_op_ne_uint(gpointer,LttvFieldValue) + * + * Applies the 'not equal' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_ne_uint(const gpointer v1, LttvFieldValue v2) { + guint* r = (guint*) v1; + return (*r != v2.v_uint); +} /** * @fn gboolean lttv_apply_op_ne_uint64(gpointer,LttvFieldValue) @@ -712,6 +776,19 @@ gboolean lttv_apply_op_ne_ltttime(const gpointer v1, LttvFieldValue v2) { return ltt_time_compare(*r, v2.v_ltttime)!=0?1:0; } +/** + * @fn gboolean lttv_apply_op_lt_uint(gpointer,LttvFieldValue) + * + * Applies the 'lower than' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_lt_uint(const gpointer v1, LttvFieldValue v2) { + guint* r = (guint*) v1; + return (*r < v2.v_uint); +} /** * @fn gboolean lttv_apply_op_lt_uint64(gpointer,LttvFieldValue) @@ -784,6 +861,19 @@ gboolean lttv_apply_op_lt_ltttime(const gpointer v1, LttvFieldValue v2) { return ltt_time_compare(*r, v2.v_ltttime)==-1?1:0; } +/** + * @fn gboolean lttv_apply_op_le_uint(gpointer,LttvFieldValue) + * + * Applies the 'lower or equal' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_le_uint(const gpointer v1, LttvFieldValue v2) { + guint* r = (guint*) v1; + return (*r <= v2.v_uint); +} /** * @fn gboolean lttv_apply_op_le_uint64(gpointer,LttvFieldValue) @@ -857,6 +947,20 @@ gboolean lttv_apply_op_le_ltttime(const gpointer v1, LttvFieldValue v2) { } +/** + * @fn gboolean lttv_apply_op_gt_uint(gpointer,LttvFieldValue) + * + * Applies the 'greater than' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_gt_uint(const gpointer v1, LttvFieldValue v2) { + guint* r = (guint*) v1; + return (*r > v2.v_uint); +} + /** * @fn gboolean lttv_apply_op_gt_uint64(gpointer,LttvFieldValue) * @@ -928,6 +1032,19 @@ gboolean lttv_apply_op_gt_ltttime(const gpointer v1, LttvFieldValue v2) { return ltt_time_compare(*r, v2.v_ltttime)==1?1:0; } +/** + * @fn gboolean lttv_apply_op_ge_uint(gpointer,LttvFieldValue) + * + * Applies the 'greater or equal' operator to the + * specified structure and value + * @param v1 left member of comparison + * @param v2 right member of comparison + * @return success/failure of operation + */ +gboolean lttv_apply_op_ge_uint(const gpointer v1, LttvFieldValue v2) { + guint* r = (guint*) v1; + return (*r >= v2.v_uint); +} /** * @fn gboolean lttv_apply_op_ge_uint64(gpointer,LttvFieldValue) @@ -1611,7 +1728,6 @@ lttv_filter_tree_parse( const LttEvent* event, const LttTracefile* tracefile, const LttTrace* trace, - const LttvProcessState* state, const LttvTracefileContext* context /*,...*/) { @@ -1652,12 +1768,18 @@ lttv_filter_tree_parse( */ gboolean lresult = FALSE, rresult = FALSE; + + LttvProcessState* state; + + guint cpu = ltt_tracefile_num(context->tf); + LttvTraceState *ts = (LttvTraceState*)context->t_context; + 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,state,context); + lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,context); } else if(t->left == LTTV_TREE_LEAF) { lresult = lttv_filter_tree_parse_branch(t->l_child.leaf,event,tracefile,trace,state,context); @@ -1674,7 +1796,7 @@ lttv_filter_tree_parse( * Parse right branch */ if(t->right == LTTV_TREE_NODE) { - rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,state,context); + rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,context); } else if(t->right == LTTV_TREE_LEAF) { rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context); @@ -1785,9 +1907,11 @@ lttv_filter_tree_parse_branch( case LTTV_FILTER_STATE_CPU: if(context == NULL) return TRUE; else { - /* FIXME: not sure of that one */ - GQuark quark = ((LttvTracefileState*)context)->cpu_name; - return se->op((gpointer)&quark,v); + /* 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); } break; case LTTV_FILTER_EVENT_NAME: