X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=5473c68f3ed8f7f653f3359084b7df52e2faebb1;hb=4d9ff9421ad51cef878f7a2e70faacf96001768e;hp=7f31c53d5b444f0b9583717d535aa0319a75d8a0;hpb=8ff6243c8bafa3a9c7bddbea54b8e9884c0707ca;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c index 7f31c53d..5473c68f 100644 --- a/ltt/branches/poly/lttv/lttv/filter.c +++ b/ltt/branches/poly/lttv/lttv/filter.c @@ -58,6 +58,7 @@ */ #include +#include /* GQuark @@ -81,43 +82,6 @@ GQuark LTTV_FILTER_CPU; */ -/** - * @fn void lttv_filter_tree_add_node(GPtrArray*,LttvFilterTree*,LttvLogicalOp) - * - * add a node to the current tree - * FIXME: Might be used to lower coding in lttv_filter_new switch expression - * @param stack the tree stack - * @param subtree the subtree if available (pointer or NULL) - * @param op the logical operator that will form the node - */ -void -lttv_filter_tree_add_node(GPtrArray* stack, LttvFilterTree* subtree, LttvLogicalOp op) { - - LttvFilterTree* t1 = NULL; - LttvFilterTree* t2 = NULL; - - t1 = (LttvFilterTree*)g_ptr_array_index(stack,stack->len-1); - while(t1->right != LTTV_TREE_IDLE) t1 = (LttvFilterTree*)t1->r_child.t; - t2 = lttv_filter_tree_new(); - t2->node = op; - if(subtree != NULL) { - t2->left = LTTV_TREE_NODE; - t2->l_child.t = subtree; - subtree = NULL; - t1->right = LTTV_TREE_NODE; - t1->r_child.t = t2; - } else { -// a_simple_expression->value = a_field_component->str; -// a_field_component = g_string_new(""); - t2->left = LTTV_TREE_LEAF; -// t2->l_child.leaf = a_simple_expression; -// a_simple_expression = g_new(lttv_simple_expression,1); - t1->right = LTTV_TREE_NODE; - t1->r_child.t = t2; - } - -} - /** * @fn LttvSimpleExpression* lttv_simple_expression_new() @@ -133,7 +97,7 @@ lttv_simple_expression_new() { se->field = LTTV_FILTER_UNDEFINED; se->op = NULL; se->offset = 0; - se->value.v_uint64 = 0; +// se->value.v_uint64 = 0; return se; } @@ -273,7 +237,6 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { /* array should be empty */ g_assert(fp->len == 0); - g_print("field: %i\n",se->field); if(se->field == LTTV_FILTER_UNDEFINED) { g_warning("The specified field was not recognized !"); return FALSE; @@ -291,11 +254,6 @@ lttv_simple_expression_assign_field(GPtrArray* fp, LttvSimpleExpression* se) { */ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionOp op) { -// g_print("se->field = %i\n",se->field); -// g_print("se->offset = %i\n",se->offset); -// g_print("se->op = %p\n",se->op); -// g_print("se->value = %s\n",se->value); - switch(se->field) { /* * string @@ -349,7 +307,7 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx } break; /* - * double + * Ltttime */ case LTTV_FILTER_STATE_CT: case LTTV_FILTER_STATE_IT: @@ -357,22 +315,22 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx case LTTV_FILTER_EVENT_TSC: switch(op) { case LTTV_FIELD_EQ: - se->op = lttv_apply_op_eq_double; + se->op = lttv_apply_op_eq_ltttime; break; case LTTV_FIELD_NE: - se->op = lttv_apply_op_ne_double; + se->op = lttv_apply_op_ne_ltttime; break; case LTTV_FIELD_LT: - se->op = lttv_apply_op_lt_double; + se->op = lttv_apply_op_lt_ltttime; break; case LTTV_FIELD_LE: - se->op = lttv_apply_op_le_double; + se->op = lttv_apply_op_le_ltttime; break; case LTTV_FIELD_GT: - se->op = lttv_apply_op_gt_double; + se->op = lttv_apply_op_gt_ltttime; break; case LTTV_FIELD_GE: - se->op = lttv_apply_op_ge_double; + se->op = lttv_apply_op_ge_ltttime; break; default: g_warning("Error encountered in operator assignment"); @@ -397,7 +355,11 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvEx */ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) { - g_print("se->value:%s\n",value); +// g_print("se->value:%s\n",value); + unsigned i; + gboolean is_double = FALSE; + LttTime t; + GString* v; switch(se->field) { /* @@ -421,13 +383,34 @@ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* val g_free(value); break; /* - * double + * LttTime */ case LTTV_FILTER_STATE_CT: case LTTV_FILTER_STATE_IT: case LTTV_FILTER_EVENT_TIME: case LTTV_FILTER_EVENT_TSC: - se->value.v_double = atof(value); + //se->value.v_double = atof(value); + /* + * parsing logic could be optimised, + * but as for now, simpler this way + */ + v = g_string_new(""); + for(i=0;ivalue.v_ltttime = t; g_free(value); break; default: @@ -504,7 +487,7 @@ lttv_struct_type(gint ft) { } /** - * @fn gboolean lttv_apply_op_eq_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_uint64(const gpointer,LttvFieldValue) * * Applies the 'equal' operator to the * specified structure and value @@ -512,7 +495,7 @@ lttv_struct_type(gint ft) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_eq_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_eq_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r == v2.v_uint64); @@ -520,7 +503,7 @@ gboolean lttv_apply_op_eq_uint64(gpointer v1, LttvFieldValue v2) { } /** - * @fn gboolean lttv_apply_op_eq_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_uint32(const gpointer,LttvFieldValue) * * Applies the 'equal' operator to the * specified structure and value @@ -528,13 +511,13 @@ gboolean lttv_apply_op_eq_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_eq_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_eq_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r == v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_eq_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_uint16(const gpointer,LttvFieldValue) * * Applies the 'equal' operator to the * specified structure and value @@ -542,13 +525,13 @@ gboolean lttv_apply_op_eq_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_eq_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_eq_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r == v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_eq_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_double(const gpointer,LttvFieldValue) * * Applies the 'equal' operator to the * specified structure and value @@ -556,13 +539,13 @@ gboolean lttv_apply_op_eq_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_eq_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_eq_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r == v2.v_double); } /** - * @fn gboolean lttv_apply_op_eq_string(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_string(const gpointer,LttvFieldValue) * * Applies the 'equal' operator to the * specified structure and value @@ -570,14 +553,28 @@ gboolean lttv_apply_op_eq_double(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_eq_string(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2) { char* r = (char*) v1; - g_print("v1:%s = v2:%s\n",r,v2.v_string); return (!g_strcasecmp(r,v2.v_string)); } /** - * @fn gboolean lttv_apply_op_ne_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_eq_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec == v2.v_ltttime.tv_nsec)); +} + + +/** + * @fn gboolean lttv_apply_op_ne_uint64(const gpointer,LttvFieldValue) * * Applies the 'not equal' operator to the * specified structure and value @@ -585,13 +582,13 @@ gboolean lttv_apply_op_eq_string(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ne_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ne_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r != v2.v_uint64); } /** - * @fn gboolean lttv_apply_op_ne_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ne_uint32(const gpointer,LttvFieldValue) * * Applies the 'not equal' operator to the * specified structure and value @@ -599,13 +596,13 @@ gboolean lttv_apply_op_ne_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ne_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ne_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r != v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_ne_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ne_uint16(const gpointer,LttvFieldValue) * * Applies the 'not equal' operator to the * specified structure and value @@ -613,13 +610,13 @@ gboolean lttv_apply_op_ne_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ne_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ne_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r != v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_ne_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ne_double(const gpointer,LttvFieldValue) * * Applies the 'not equal' operator to the * specified structure and value @@ -627,13 +624,13 @@ gboolean lttv_apply_op_ne_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ne_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ne_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r != v2.v_double); } /** - * @fn gboolean lttv_apply_op_ne_string(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ne_string(const gpointer,LttvFieldValue) * * Applies the 'not equal' operator to the * specified structure and value @@ -641,13 +638,28 @@ gboolean lttv_apply_op_ne_double(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ne_string(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ne_string(const gpointer v1, LttvFieldValue v2) { char* r = (char*) v1; return (g_strcasecmp(r,v2.v_string)); } /** - * @fn gboolean lttv_apply_op_lt_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ne_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ltt_time_compare(*r, v2.v_ltttime)!=0?1:0; +} + + +/** + * @fn gboolean lttv_apply_op_lt_uint64(const gpointer,LttvFieldValue) * * Applies the 'lower than' operator to the * specified structure and value @@ -655,13 +667,13 @@ gboolean lttv_apply_op_ne_string(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_lt_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_lt_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r < v2.v_uint64); } /** - * @fn gboolean lttv_apply_op_lt_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_lt_uint32(const gpointer,LttvFieldValue) * * Applies the 'lower than' operator to the * specified structure and value @@ -669,13 +681,13 @@ gboolean lttv_apply_op_lt_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_lt_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_lt_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r < v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_lt_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_lt_uint16(const gpointer,LttvFieldValue) * * Applies the 'lower than' operator to the * specified structure and value @@ -683,13 +695,13 @@ gboolean lttv_apply_op_lt_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_lt_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_lt_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r < v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_lt_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_lt_double(const gpointer,LttvFieldValue) * * Applies the 'lower than' operator to the * specified structure and value @@ -697,13 +709,28 @@ gboolean lttv_apply_op_lt_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_lt_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_lt_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r < v2.v_double); } /** - * @fn gboolean lttv_apply_op_le_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_lt_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec < v2.v_ltttime.tv_nsec))); +} + + +/** + * @fn gboolean lttv_apply_op_le_uint64(const gpointer,LttvFieldValue) * * Applies the 'lower or equal' operator to the * specified structure and value @@ -711,13 +738,13 @@ gboolean lttv_apply_op_lt_double(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_le_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_le_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r <= v2.v_uint64); } /** - * @fn gboolean lttv_apply_op_le_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_le_uint32(const gpointer,LttvFieldValue) * * Applies the 'lower or equal' operator to the * specified structure and value @@ -725,13 +752,13 @@ gboolean lttv_apply_op_le_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_le_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_le_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r <= v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_le_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_le_uint16(const gpointer,LttvFieldValue) * * Applies the 'lower or equal' operator to the * specified structure and value @@ -739,13 +766,13 @@ gboolean lttv_apply_op_le_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_le_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_le_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r <= v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_le_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_le_double(const gpointer,LttvFieldValue) * * Applies the 'lower or equal' operator to the * specified structure and value @@ -753,13 +780,28 @@ gboolean lttv_apply_op_le_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_le_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_le_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r <= v2.v_double); } /** - * @fn gboolean lttv_apply_op_gt_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_le_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ((r->tv_sec < v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec <= v2.v_ltttime.tv_nsec))); +} + + +/** + * @fn gboolean lttv_apply_op_gt_uint64(const gpointer,LttvFieldValue) * * Applies the 'greater than' operator to the * specified structure and value @@ -767,13 +809,13 @@ gboolean lttv_apply_op_le_double(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_gt_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_gt_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r > v2.v_uint64); } /** - * @fn gboolean lttv_apply_op_gt_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_gt_uint32(const gpointer,LttvFieldValue) * * Applies the 'greater than' operator to the * specified structure and value @@ -781,13 +823,13 @@ gboolean lttv_apply_op_gt_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_gt_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_gt_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r > v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_gt_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_gt_uint16(const gpointer,LttvFieldValue) * * Applies the 'greater than' operator to the * specified structure and value @@ -795,13 +837,13 @@ gboolean lttv_apply_op_gt_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_gt_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_gt_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r > v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_gt_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_gt_double(const gpointer,LttvFieldValue) * * Applies the 'greater than' operator to the * specified structure and value @@ -809,13 +851,28 @@ gboolean lttv_apply_op_gt_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_gt_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_gt_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r > v2.v_double); } /** - * @fn gboolean lttv_apply_op_ge_uint64(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_gt_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec > v2.v_ltttime.tv_nsec))); +} + + +/** + * @fn gboolean lttv_apply_op_ge_uint64(const gpointer,LttvFieldValue) * * Applies the 'greater or equal' operator to the * specified structure and value @@ -823,13 +880,13 @@ gboolean lttv_apply_op_gt_double(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ge_uint64(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ge_uint64(const gpointer v1, LttvFieldValue v2) { guint64* r = (guint64*) v1; return (*r >= v2.v_uint64); } /** - * @fn gboolean lttv_apply_op_ge_uint32(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ge_uint32(const gpointer,LttvFieldValue) * * Applies the 'greater or equal' operator to the * specified structure and value @@ -837,13 +894,13 @@ gboolean lttv_apply_op_ge_uint64(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ge_uint32(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ge_uint32(const gpointer v1, LttvFieldValue v2) { guint32* r = (guint32*) v1; return (*r >= v2.v_uint32); } /** - * @fn gboolean lttv_apply_op_ge_uint16(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ge_uint16(const gpointer,LttvFieldValue) * * Applies the 'greater or equal' operator to the * specified structure and value @@ -851,13 +908,13 @@ gboolean lttv_apply_op_ge_uint32(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ge_uint16(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ge_uint16(const gpointer v1, LttvFieldValue v2) { guint16* r = (guint16*) v1; return (*r >= v2.v_uint16); } /** - * @fn gboolean lttv_apply_op_ge_double(gpointer,LttvFieldValue) + * @fn gboolean lttv_apply_op_ge_double(const gpointer,LttvFieldValue) * * Applies the 'greater or equal' operator to the * specified structure and value @@ -865,11 +922,26 @@ gboolean lttv_apply_op_ge_uint16(gpointer v1, LttvFieldValue v2) { * @param v2 right member of comparison * @return success/failure of operation */ -gboolean lttv_apply_op_ge_double(gpointer v1, LttvFieldValue v2) { +gboolean lttv_apply_op_ge_double(const gpointer v1, LttvFieldValue v2) { double* r = (double*) v1; return (*r >= v2.v_double); } +/** + * @fn gboolean lttv_apply_op_ge_ltttime(const 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_ltttime(const gpointer v1, LttvFieldValue v2) { + LttTime* r = (LttTime*) v1; + return ((r->tv_sec > v2.v_ltttime.tv_sec) || ((r->tv_sec == v2.v_ltttime.tv_sec) && (r->tv_nsec >= v2.v_ltttime.tv_nsec))); +} + + /** * @fn LttvFilterTree* lttv_filter_tree_clone(LttvFilterTree*) @@ -879,7 +951,7 @@ gboolean lttv_apply_op_ge_double(gpointer v1, LttvFieldValue v2) { * @return new copy of the filter tree */ LttvFilterTree* -lttv_filter_tree_clone(LttvFilterTree* tree) { +lttv_filter_tree_clone(const LttvFilterTree* tree) { LttvFilterTree* newtree = lttv_filter_tree_new(); @@ -920,8 +992,7 @@ lttv_filter_tree_clone(LttvFilterTree* tree) { * @return new copy of the filter */ LttvFilter* -lttv_filter_clone(LttvFilter* filter) { - +lttv_filter_clone(const LttvFilter* filter) { LttvFilter* newfilter = g_new(LttvFilter,1); @@ -963,7 +1034,7 @@ 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; @@ -1036,11 +1107,10 @@ lttv_filter_update(LttvFilter* filter) { * 3. pop the tree value from the tree stack */ - g_print("expression: %s\n",filter->expression); - g_print("strlen(expression): %i\n",strlen(filter->expression)); for(i=0;iexpression);i++) { // debug - g_print("%c ",filter->expression[i]); + //g_print("%c ",filter->expression[i]); + switch(filter->expression[i]) { /* * logical operators @@ -1062,14 +1132,12 @@ lttv_filter_update(LttvFilter* filter) { t1->r_child.t = t2; } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); - // a_simple_expression->value = g_string_free(a_field_component,FALSE); a_field_component = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); t1->right = LTTV_TREE_NODE; t1->r_child.t = t2; - g_print("t1:%p t1->child:%p\n",t1,t1->r_child.t); } break; @@ -1090,7 +1158,6 @@ lttv_filter_update(LttvFilter* filter) { t1->r_child.t = t2; } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); - //a_simple_expression->value = g_string_free(a_field_component,FALSE); a_field_component = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; @@ -1117,7 +1184,6 @@ lttv_filter_update(LttvFilter* filter) { t1->r_child.t = t2; } else { /* append a simple expression */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); - //a_simple_expression->value = g_string_free(a_field_component,FALSE); a_field_component = g_string_new(""); t2->left = LTTV_TREE_LEAF; t2->l_child.leaf = a_simple_expression; @@ -1183,17 +1249,13 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_remove_index(tree_stack,tree_stack->len-1); } else { /* assign subtree as current tree */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); - //a_simple_expression->value = g_string_free(a_field_component,FALSE); a_field_component = g_string_new(""); t1 = g_ptr_array_index(tree_stack,tree_stack->len-1); - g_print("here\n"); while(t1->right != LTTV_TREE_IDLE) { - g_print("while right:%i %p->child:%p\n",t1->right,t1,t1->r_child.t); g_assert(t1->right == LTTV_TREE_NODE); g_assert(t1->r_child.t != NULL); t1 = t1->r_child.t; } - g_print("here2\n"); t1->right = LTTV_TREE_LEAF; t1->r_child.leaf = a_simple_expression; a_simple_expression = lttv_simple_expression_new(); @@ -1242,24 +1304,22 @@ lttv_filter_update(LttvFilter* filter) { /* * divide field expression into elements * in a_field_path array. + * + * A dot can also be present in double values */ - /* FIXME: check for double values */ 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(""); } break; - case ' ': - case '\n': + case ' ': /* ignore */ + case '\n': /* ignore */ break; default: /* concatening current string */ g_string_append_c(a_field_component,filter->expression[i]); } } - g_print("subtree:%p, tree:%p, t1:%p, t2:%p\n",subtree,tree,t1,t2); - g_print("stack size: %i\n",tree_stack->len); - /* * Preliminary check to see * if tree was constructed correctly @@ -1285,7 +1345,6 @@ lttv_filter_update(LttvFilter* filter) { subtree = NULL; } else { /* add a leaf */ lttv_simple_expression_assign_value(a_simple_expression,g_string_free(a_field_component,FALSE)); - //a_simple_expression->value = g_string_free(a_field_component,FALSE); a_field_component = NULL; t1->right = LTTV_TREE_LEAF; t1->r_child.leaf = a_simple_expression; @@ -1298,7 +1357,6 @@ lttv_filter_update(LttvFilter* filter) { g_ptr_array_free(a_field_path,TRUE); /* free the tree stack -- but keep the root tree */ - // g_ptr_array_free(tree_stack,FALSE); filter->head = g_ptr_array_remove_index(tree_stack,0); g_ptr_array_free(tree_stack,TRUE); @@ -1376,6 +1434,9 @@ gboolean lttv_filter_append_expression(LttvFilter* filter, char *expression) { filter->expression = expression; } else { filter->expression = g_strconcat(filter->expression,"&",expression); + + /* clear expression */ + g_free(expression); } return lttv_filter_update(filter); @@ -1429,14 +1490,17 @@ lttv_filter_tree_destroy(LttvFilterTree* tree) { * @param tracefile current LttTracefile, NULL if not used * @param trace current LttTrace, NULL if not used * @param state current LttvProcessState, NULL if not used + * @param context current LttvTracefileContext, NULL if not used + * @return response of filter */ gboolean lttv_filter_tree_parse( - LttvFilterTree* t, - LttEvent* event, - LttTracefile* tracefile, - LttTrace* trace, - LttvProcessState* state + const LttvFilterTree* t, + const LttEvent* event, + const LttTracefile* tracefile, + const LttTrace* trace, + const LttvProcessState* state, + const LttvTracefileContext* context /*,...*/) { @@ -1474,122 +1538,19 @@ lttv_filter_tree_parse( * -Result of left branch will not affect exploration of * right branch */ - g_print("filter::lttv_parse_tree(...)\n"); gboolean lresult = FALSE, rresult = FALSE; /* * Parse left branch */ - if(t->left == LTTV_TREE_NODE) lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,state); + if(t->left == LTTV_TREE_NODE) { + lresult = lttv_filter_tree_parse(t->l_child.t,event,tracefile,trace,state,context); + } else if(t->left == LTTV_TREE_LEAF) { - //g_print("%p: left is %i %p %s\n",t,t->l_child.leaf->field,t->l_child.leaf->op,t->l_child.leaf->value); - LttvFieldValue v; - v = t->l_child.leaf->value; - switch(t->l_child.leaf->field) { - - case LTTV_FILTER_TRACE_NAME: - if(trace == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)ltt_trace_name(trace),v); - break; - case LTTV_FILTER_TRACEFILE_NAME: - if(tracefile == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)ltt_tracefile_name(tracefile),v); - break; - case LTTV_FILTER_STATE_PID: - if(state == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)&state->pid,v); - break; - case LTTV_FILTER_STATE_PPID: - if(state == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)&state->ppid,v); - break; - case LTTV_FILTER_STATE_CT: - if(state == NULL) lresult = TRUE; - else { - double val = ltt_time_to_double(state->creation_time); - lresult = t->l_child.leaf->op((gpointer)&val,v); - } - break; - case LTTV_FILTER_STATE_IT: - if(state == NULL) lresult = TRUE; - else { - double val = ltt_time_to_double(state->insertion_time); - lresult = t->l_child.leaf->op((gpointer)&val,v); - } - break; - case LTTV_FILTER_STATE_P_NAME: - /* - * FIXME: Yet to be done ( I think ? ) - */ - lresult = TRUE; - break; - case LTTV_FILTER_STATE_EX_MODE: - if(state == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)&state->state->t,v); - break; - case LTTV_FILTER_STATE_EX_SUBMODE: - if(state == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)&state->state->n,v); - break; - case LTTV_FILTER_STATE_P_STATUS: - if(state == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)&state->state->s,v); - break; - case LTTV_FILTER_STATE_CPU: - /* - * FIXME: What is the comparison value ? - */ - lresult = TRUE; - break; - case LTTV_FILTER_EVENT_NAME: - if(event == NULL) lresult = TRUE; - else lresult = t->l_child.leaf->op((gpointer)ltt_event_eventtype(event),v); - break; - - case LTTV_FILTER_EVENT_CATEGORY: - /* - * FIXME: Not yet implemented - */ - lresult = TRUE; - break; - case LTTV_FILTER_EVENT_TIME: -// if(event == NULL) lresult = TRUE; -// else { -// double val = ltt_time_to_double(event->event_time); -// lresult = t->l_child.leaf->op((gpointer)&val,v); -// } - lresult = TRUE; - break; - case LTTV_FILTER_EVENT_TSC: -// if(event == NULL) lresult = TRUE; -// else { -// double val = ltt_time_to_double(event->event_time); -// lresult = t->l_child.leaf->op((gpointer)&val,v); -// } - /* - * FIXME: Where is event.tsc - */ - lresult = TRUE; - break; - case LTTV_FILTER_EVENT_FIELD: - /* - * TODO: Use the offset to - * find the dynamic field - * in the event struct - */ - lresult = TRUE; - default: - /* - * This case should never be - * parsed, if so, the whole - * filtering is cancelled - */ - g_warning("Error while parsing the filter tree"); - return TRUE; - } + lresult = lttv_filter_tree_parse_branch(t->l_child.leaf,event,tracefile,trace,state,context); } - + /* * Parse linking operator * make a cutoff if possible @@ -1600,96 +1561,145 @@ 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); + if(t->right == LTTV_TREE_NODE) { + rresult = lttv_filter_tree_parse(t->r_child.t,event,tracefile,trace,state,context); + } else if(t->right == LTTV_TREE_LEAF) { - //g_print("%p: right is %i %p %s\n",t,t->r_child.leaf->field,t->r_child.leaf->op,t->r_child.leaf->value); + rresult = lttv_filter_tree_parse_branch(t->r_child.leaf,event,tracefile,trace,state,context); + } + + /* + * Apply and return the + * logical link between the + * two operation + */ + switch(t->node) { + case LTTV_LOGICAL_OR: return (lresult | rresult); + case LTTV_LOGICAL_AND: return (lresult & rresult); + case LTTV_LOGICAL_NOT: return (!rresult); + case LTTV_LOGICAL_XOR: return (lresult ^ rresult); + case 0: return (rresult); + default: + /* + * This case should never be + * parsed, if so, this subtree + * is cancelled ! + */ + return TRUE; + } + +} + +/** + * @fn gboolean lttv_filter_tree_parse_branch(LttvFilterTree*,LttEvent*,LttTracefile*,LttTrace*,LttvProcessState*,LttvTracefileContext*) + * + * This function parses a particular branch of the tree + * @param tree pointer to the current LttvFilterTree + * @param event current LttEvent, NULL if not used + * @param tracefile current LttTracefile, NULL if not used + * @param trace current LttTrace, NULL if not used + * @param state current LttvProcessState, NULL if not used + * @param context current LttvTracefileContext, NULL if not used + * @return response of filter + */ +gboolean lttv_filter_tree_parse_branch( + const LttvSimpleExpression* se, + const LttEvent* event, + const LttTracefile* tracefile, + const LttTrace* trace, + const LttvProcessState* state, + const LttvTracefileContext* context) { + LttvFieldValue v; - v = t->r_child.leaf->value; - switch(t->r_child.leaf->field) { - + v = se->value; + switch(se->field) { case LTTV_FILTER_TRACE_NAME: - if(trace == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)ltt_trace_name(trace),v); + if(trace == NULL) return TRUE; + else return se->op((gpointer)ltt_trace_name(trace),v); break; case LTTV_FILTER_TRACEFILE_NAME: - if(tracefile == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)ltt_tracefile_name(tracefile),v); + if(tracefile == NULL) return TRUE; + else return se->op((gpointer)ltt_tracefile_name(tracefile),v); break; case LTTV_FILTER_STATE_PID: - if(state == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)&state->pid,v); + if(state == NULL) return TRUE; + else return se->op((gpointer)&state->pid,v); break; case LTTV_FILTER_STATE_PPID: - if(state == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)&state->ppid,v); + if(state == NULL) return TRUE; + else return se->op((gpointer)&state->ppid,v); break; case LTTV_FILTER_STATE_CT: - if(state == NULL) rresult = TRUE; + if(state == NULL) return TRUE; else { - double val = ltt_time_to_double(state->creation_time); - rresult = t->r_child.leaf->op((gpointer)&val,v); + return se->op((gpointer)&state->creation_time,v); } break; case LTTV_FILTER_STATE_IT: - if(state == NULL) rresult = TRUE; + if(state == NULL) return TRUE; else { - double val = ltt_time_to_double(state->insertion_time); - rresult = t->r_child.leaf->op((gpointer)&val,v); + return se->op((gpointer)&state->insertion_time,v); } break; case LTTV_FILTER_STATE_P_NAME: /* - * FIXME: Yet to be done ( I think ? ) + * All 'unnamed' for the moment */ - rresult = TRUE; + if(state == NULL) return TRUE; + else { + return se->op((gpointer)g_quark_to_string(state->name),v); + } break; case LTTV_FILTER_STATE_EX_MODE: - if(state == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)&state->state->t,v); + if(state == NULL) return TRUE; + else return se->op((gpointer)&state->state->t,v); break; case LTTV_FILTER_STATE_EX_SUBMODE: - if(state == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)&state->state->n,v); + if(state == NULL) return TRUE; + else return se->op((gpointer)&state->state->n,v); break; case LTTV_FILTER_STATE_P_STATUS: - if(state == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)&state->state->s,v); + if(state == NULL) return TRUE; + else return se->op((gpointer)&state->state->s,v); break; case LTTV_FILTER_STATE_CPU: - /* - * FIXME: What is the comparison value ? - */ - rresult = TRUE; + if(context == NULL) return TRUE; + else { + return se->op((gpointer)g_quark_to_string(((LttvTracefileState*)context)->cpu_name),v); + } break; case LTTV_FILTER_EVENT_NAME: - if(event == NULL) rresult = TRUE; - else rresult = t->r_child.leaf->op((gpointer)ltt_event_eventtype(event),v); + if(event == NULL) return TRUE; + else { + LttEventType* et; + et = ltt_event_eventtype(event); + return se->op((gpointer)ltt_eventtype_name(et),v); + } break; case LTTV_FILTER_EVENT_CATEGORY: /* * FIXME: Not yet implemented */ - rresult = TRUE; + return TRUE; break; case LTTV_FILTER_EVENT_TIME: -// if(event == NULL) rresult = TRUE; -// else { -// double val = ltt_time_to_double(event->event_time); -// rresult = t->r_child.leaf->op((gpointer)&val,v); -// } - rresult = TRUE; + if(event == NULL) return TRUE; + else { + LttTime time = ltt_event_time(event); + return se->op((gpointer)&time,v); + } break; case LTTV_FILTER_EVENT_TSC: -// if(event == NULL) rresult = TRUE; +// if(event == NULL) return TRUE; // else { // double val = ltt_time_to_double(event->event_time); -// rresult = t->r_child.leaf->op((gpointer)&val,v); +// return se->op((gpointer)&val,v); // } /* * FIXME: Where is event.tsc */ - rresult = TRUE; + return TRUE; break; case LTTV_FILTER_EVENT_FIELD: /* @@ -1697,40 +1707,24 @@ lttv_filter_tree_parse( * find the dynamic field * in the event struct */ - rresult = TRUE; + return TRUE; default: /* * This case should never be - * parsed, if so, this subtree - * is cancelled ! + * parsed, if so, the whole + * filtering is cancelled */ g_warning("Error while parsing the filter tree"); return TRUE; } - } - - /* - * Apply and return the - * logical link between the - * two operation - */ - switch(t->node) { - case LTTV_LOGICAL_OR: return (lresult | rresult); - case LTTV_LOGICAL_AND: return (lresult & rresult); - case LTTV_LOGICAL_NOT: return (!rresult); - case LTTV_LOGICAL_XOR: return (lresult ^ rresult); - case 0: return (rresult); - default: - /* - * This case should never be - * parsed, if so, this subtree - * is cancelled ! - */ - return TRUE; - } - + + /* should never get here */ + return TRUE; + } + + /** * @fn void lttv_print_tree(LttvFilterTree*) * @@ -1738,7 +1732,7 @@ lttv_filter_tree_parse( * @param t the pointer to the current LttvFilterTree */ void -lttv_print_tree(LttvFilterTree* t) { +lttv_print_tree(const LttvFilterTree* t) { g_print("node:%p lchild:%p rchild:%p\n",t, //t->l_child.t,t->r_child.t); (t->left==LTTV_TREE_NODE)?t->l_child.t:NULL, @@ -1746,57 +1740,15 @@ lttv_print_tree(LttvFilterTree* t) { g_print("node type: %i / [left] %i / [right] %i\n",t->node,t->left,t->right); if(t->left == LTTV_TREE_NODE) lttv_print_tree(t->l_child.t); else if(t->left == LTTV_TREE_LEAF) { -// g_assert(t->l_child.leaf->value != NULL); g_print("%p: left is %i %p value\n",t,t->l_child.leaf->field,t->l_child.leaf->op); } if(t->right == LTTV_TREE_NODE) lttv_print_tree(t->r_child.t); else if(t->right == LTTV_TREE_LEAF) { -// g_assert(t->r_child.leaf->value != NULL); g_print("%p: right is %i %p value\n",t,t->r_child.leaf->field,t->r_child.leaf->op); } } -/** - * @fn gboolean lttv_filter_tracefile(LttvFilter*, LttTracefile*) - * - * Apply the filter to a specific trace - * @param filter the current filter applied - * @param tracefile the trace to apply the filter to - * @return success/failure of operation - */ -gboolean -lttv_filter_tracefile(LttvFilter *filter, LttTracefile *tracefile) { - - return lttv_filter_tree_parse(filter->head,NULL,tracefile,NULL,NULL); - -} - -/** - * @fn gboolean lttv_filter_tracestate(LttvFilter*,LttvTraceState*) - * - * Parse the current tracestate - * @param filter pointer to the current LttvFilter - * @param tracestate pointer to the current tracestate - */ -gboolean -lttv_filter_tracestate(LttvFilter *filter, LttvTraceState *tracestate) { - -} - -/** - * @fn gboolean lttv_filter_event(LttvFilter*,LttEvent*) - * - * Apply the filter to a specific event - * @param filter the current filter applied - * @param event the event to apply the filter to - * @return success/failure of operation - */ -gboolean -lttv_filter_event(LttvFilter *filter, LttEvent *event) { - -} - /** * @fn static void module_init() *