LttvSimpleExpression* se = g_new(LttvSimpleExpression,1);
se->field = LTTV_FILTER_UNDEFINED;
+ se->op = NULL;
se->offset = 0;
se->value = NULL;
}
/**
* 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
* by user. This function compares each value to
* predetermined quarks
* @param fp The field path list
+ * @param se current simple expression
* @return success/failure of operation
*/
gboolean
return FALSE;
}
+ /* free the pointer array */
+ g_ptr_array_free(fp,FALSE);
+
return TRUE;
}
+/**
+ * Sets the function pointer for the current
+ * Simple Expression
+ * @param se current simple expression
+ * @return success/failure of operation
+ */
+gboolean 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) {
+ /* char */
+ case LTTV_FILTER_TRACE_NAME:
+ case LTTV_FILTER_TRACEFILE_NAME:
+ case LTTV_FILTER_STATE_P_NAME:
+ case LTTV_FILTER_EVENT_NAME:
+ switch(op) {
+ case LTTV_FIELD_EQ:
+ se->op = lttv_apply_op_eq_string;
+ break;
+ case LTTV_FIELD_NE:
+ se->op = lttv_apply_op_eq_string;
+ break;
+ default:
+ g_warning("Error encountered in operator assignment");
+ return FALSE;
+ }
+ break;
+ case LTTV_FILTER_STATE_PID:
+ case LTTV_FILTER_STATE_PPID:
+ case LTTV_FILTER_STATE_EX_MODE:
+ case LTTV_FILTER_STATE_EX_SUBMODE:
+ case LTTV_FILTER_STATE_P_STATUS:
+ switch(op) {
+ case LTTV_FIELD_EQ:
+ se->op = lttv_apply_op_eq_uint64;
+ break;
+ case LTTV_FIELD_NE:
+ se->op = lttv_apply_op_ne_uint64;
+ break;
+ case LTTV_FIELD_LT:
+ se->op = lttv_apply_op_lt_uint64;
+ break;
+ case LTTV_FIELD_LE:
+ se->op = lttv_apply_op_le_uint64;
+ break;
+ case LTTV_FIELD_GT:
+ se->op = lttv_apply_op_gt_uint64;
+ break;
+ case LTTV_FIELD_GE:
+ se->op = lttv_apply_op_ge_uint64;
+ break;
+ default:
+ g_warning("Error encountered in operator assignment");
+ return FALSE;
+ }
+ break;
+ case LTTV_FILTER_STATE_CT:
+ case LTTV_FILTER_STATE_IT:
+ case LTTV_FILTER_EVENT_TIME:
+ case LTTV_FILTER_EVENT_TSC:
+ switch(op) {
+ case LTTV_FIELD_EQ:
+ se->op = lttv_apply_op_eq_double;
+ break;
+ case LTTV_FIELD_NE:
+ se->op = lttv_apply_op_ne_double;
+ break;
+ case LTTV_FIELD_LT:
+ se->op = lttv_apply_op_lt_double;
+ break;
+ case LTTV_FIELD_LE:
+ se->op = lttv_apply_op_le_double;
+ break;
+ case LTTV_FIELD_GT:
+ se->op = lttv_apply_op_gt_double;
+ break;
+ case LTTV_FIELD_GE:
+ se->op = lttv_apply_op_ge_double;
+ break;
+ default:
+ g_warning("Error encountered in operator assignment");
+ return FALSE;
+ }
+ break;
+ default:
+ g_warning("Error encountered in operator assignment");
+ return FALSE;
+ }
+
+ return TRUE;
+
+
+}
+
/**
* Add an filtering option to the current tree
* @param expression Current expression to parse
+}
+
+/**
+ * Append a new expression to the expression
+ * defined in the current filter
+ * @param filter pointer to the current LttvFilter
+ * @param expression string that must be appended
+ */
+void lttv_filter_append_expression(LttvFilter* filter, char *expression) {
+
+ if(expression == NULL) return;
+ if(filter == NULL) {
+ filter = lttv_filter_new();
+ filter->expression = expression;
+ } else if(filter->expression == NULL) {
+ filter->expression = expression;
+ } else {
+ filter->expression = g_strconcat(filter->expression,"&",expression);
+ }
+
+ lttv_filter_update(filter);
+
+}
+
+/**
+ * Clear the filter expression from the
+ * current filter and sets its pointer to NULL
+ * @param filter pointer to the current LttvFilter
+ */
+void lttv_filter_clear_expression(LttvFilter* filter) {
+
+ if(filter->expression != NULL) {
+ g_free(filter->expression);
+ filter->expression = NULL;
+ }
+
}
/**
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_eq_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_eq_uint64(gpointer v1, char* v2) {
+
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r == l);
+
+}
/**
* Applies the 'equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_eq_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_eq_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r == l);
+}
/**
* Applies the 'equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_eq_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_eq_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r == l);
+}
/**
* Applies the 'equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_eq_double(double v1, double v2) {}
+gboolean lttv_apply_op_eq_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r == l);
+}
/**
* Applies the 'equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_eq_string(char* v1, char* v2) {}
+gboolean lttv_apply_op_eq_string(gpointer v1, char* v2) {
+ char* r = (char*) v1;
+ return (g_strcasecmp(r,v2));
+}
/**
* Applies the 'not equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ne_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_ne_uint64(gpointer v1, char* v2) {
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r != l);
+}
/**
* Applies the 'not equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ne_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_ne_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r != l);
+}
/**
* Applies the 'not equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ne_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_ne_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r != l);
+}
/**
* Applies the 'not equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ne_double(double v1, double v2) {}
+gboolean lttv_apply_op_ne_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r != l);
+}
/**
* Applies the 'not equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ne_string(char* v1, char* v2) {}
+gboolean lttv_apply_op_ne_string(gpointer v1, char* v2) {
+ char* r = (char*) v1;
+ return (!g_strcasecmp(r,v2));
+}
/**
* Applies the 'lower than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_lt_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_lt_uint64(gpointer v1, char* v2) {
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r < l);
+}
/**
* Applies the 'lower than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_lt_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_lt_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r < l);
+}
/**
* Applies the 'lower than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_lt_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_lt_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r < l);
+}
/**
* Applies the 'lower than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_lt_double(double v1, double v2) {}
+gboolean lttv_apply_op_lt_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r < l);
+}
/**
* Applies the 'lower than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_le_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_le_uint64(gpointer v1, char* v2) {
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r <= l);
+}
/**
* Applies the 'lower or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_le_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_le_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r <= l);
+}
/**
* Applies the 'lower or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_le_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_le_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r <= l);
+}
/**
* Applies the 'lower or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_le_double(double v1, double v2) {}
+gboolean lttv_apply_op_le_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r <= l);
+}
/**
- * Applies the 'lower or equal' operator to the
+ * 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_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_gt_uint64(gpointer v1, char* v2) {
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r > l);
+}
/**
* Applies the 'greater than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_gt_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_gt_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r > l);
+}
/**
* Applies the 'greater than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_gt_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_gt_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r > l);
+}
/**
* Applies the 'greater than' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_gt_double(double v1, double v2) {}
+gboolean lttv_apply_op_gt_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r > l);
+}
/**
- * Applies the 'greater than' operator to the
+ * 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_uint64(guint64 v1, guint64 v2) {}
+gboolean lttv_apply_op_ge_uint64(gpointer v1, char* v2) {
+ guint64* r = (guint64*) v1;
+ guint64 l = atoi(v2);
+ return (*r >= l);
+}
/**
* Applies the 'greater or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ge_uint32(guint32 v1, guint32 v2) {}
+gboolean lttv_apply_op_ge_uint32(gpointer v1, char* v2) {
+ guint32* r = (guint32*) v1;
+ guint32 l = atoi(v2);
+ return (*r >= l);
+}
/**
* Applies the 'greater or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ge_uint16(guint16 v1, guint16 v2) {}
+gboolean lttv_apply_op_ge_uint16(gpointer v1, char* v2) {
+ guint16* r = (guint16*) v1;
+ guint16 l = atoi(v2);
+ return (*r >= l);
+}
/**
* Applies the 'greater or equal' operator to the
* @param v2 right member of comparison
* @return success/failure of operation
*/
-gboolean lttv_apply_op_ge_double(double v1, double v2) {}
+gboolean lttv_apply_op_ge_double(gpointer v1, char* v2) {
+ double* r = (double*) v1;
+ double l = atof(v2);
+ return (*r >= l);
+}
/**
LttvFilterTree*
lttv_filter_tree_clone(LttvFilterTree* tree) {
-
+ LttvFilterTree* newtree = lttv_filter_tree_new();
+ newtree->node = tree->node;
+
+ newtree->left = tree->left;
+ if(newtree->left == LTTV_TREE_NODE) {
+ newtree->l_child.t = lttv_filter_tree_clone(tree->l_child.t);
+ } else if(newtree->left == LTTV_TREE_LEAF) {
+ newtree->l_child.leaf = lttv_simple_expression_new();
+ newtree->l_child.leaf->field = tree->l_child.leaf->field;
+ newtree->l_child.leaf->offset = tree->l_child.leaf->offset;
+ newtree->l_child.leaf->op = tree->l_child.leaf->op;
+ newtree->l_child.leaf->value = g_strconcat(tree->l_child.leaf->value);
+ }
+
+ newtree->right = tree->right;
+ if(newtree->right == LTTV_TREE_NODE) {
+ newtree->r_child.t = lttv_filter_tree_clone(tree->r_child.t);
+ } else if(newtree->right == LTTV_TREE_LEAF) {
+ newtree->r_child.leaf = lttv_simple_expression_new();
+ newtree->r_child.leaf->field = tree->r_child.leaf->field;
+ newtree->r_child.leaf->offset = tree->r_child.leaf->offset;
+ newtree->r_child.leaf->op = tree->r_child.leaf->op;
+ newtree->r_child.leaf->value = g_strconcat(tree->r_child.leaf->value);
+ }
+
+ return newtree;
+
}
/**
* @return the current lttv_filter or NULL if error
*/
LttvFilter*
-lttv_filter_new(char *expression, LttvTraceState *tcs) {
+lttv_filter_new() {
- g_print("filter::lttv_filter_new()\n"); /* debug */
+ LttvFilter* filter = g_new(LttvFilter,1);
+ filter->expression = NULL;
+ filter->head = NULL;
+
+}
+/**
+ * Updates the current LttvFilter by building
+ * its tree based upon the expression string
+ * @param filter pointer to the current LttvFilter
+ * @return Failure/Success of operation
+ */
+gboolean
+lttv_filter_update(LttvFilter* filter) {
+
+ g_print("filter::lttv_filter_new()\n"); /* debug */
+
+ if(filter->expression == NULL) return FALSE;
+
unsigned
i,
p_nesting=0, /* parenthesis nesting value */
*t1, /* buffer #1 */
*t2; /* buffer #2 */
+ /*
+ * the filter
+ * If the tree already exists,
+ * destroy it and build a new one
+ */
+ if(filter->head != NULL) lttv_filter_tree_destroy(filter->head);
+ filter->head = tree;
+
/*
* Tree Stack
* each element of the list
g_ptr_array_set_size(a_field_path,2); /* by default, recording 2 field expressions */
- for(i=0;i<strlen(expression);i++) {
-// g_print("%s\n",a_field_component->str);
- g_print("%c ",expression[i]);
-// g_print("switch:%c -->subtree:%p\n",expression[i],subtree);
- switch(expression[i]) {
+ for(i=0;i<strlen(filter->expression);i++) {
+ // debug
+ g_print("%c ",filter->expression[i]);
+ switch(filter->expression[i]) {
/*
* logical operators
*/
case '&': /* and */
+
t1 = (LttvFilterTree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
t2 = lttv_filter_tree_new();
t2->node = LTTV_LOGICAL_AND;
- if(subtree != NULL) {
+ if(subtree != NULL) { /* append subtree to current tree */
t2->left = LTTV_TREE_NODE;
t2->l_child.t = subtree;
subtree = NULL;
t1->right = LTTV_TREE_NODE;
t1->r_child.t = t2;
- } else {
+ } else { /* append a simple expression */
a_simple_expression->value = a_field_component->str;
a_field_component = g_string_new("");
t2->left = LTTV_TREE_LEAF;
t1->right = LTTV_TREE_NODE;
t1->r_child.t = t2;
}
-
break;
+
case '|': /* or */
+
t1 = (LttvFilter*)g_ptr_array_index(tree_stack,tree_stack->len-1);
while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
t2 = lttv_filter_tree_new();
t2->node = LTTV_LOGICAL_OR;
- if(subtree != NULL) {
+ if(subtree != NULL) { /* append subtree to current tree */
t2->left = LTTV_TREE_NODE;
t2->l_child.t = subtree;
subtree = NULL;
t1->right = LTTV_TREE_NODE;
t1->r_child.t = t2;
- } else {
+ } else { /* append a simple expression */
a_simple_expression->value = a_field_component->str;
a_field_component = g_string_new("");
t2->left = LTTV_TREE_LEAF;
t1->r_child.t = t2;
}
break;
+
case '^': /* xor */
+
t1 = (LttvFilter*)g_ptr_array_index(tree_stack,tree_stack->len-1);
while(t1->right != LTTV_TREE_IDLE) t1 = t1->r_child.t;
t2 = lttv_filter_tree_new();
t2->node = LTTV_LOGICAL_XOR;
- if(subtree != NULL) {
+ if(subtree != NULL) { /* append subtree to current tree */
t2->left = LTTV_TREE_NODE;
t2->l_child.t = subtree;
subtree = NULL;
t1->right = LTTV_TREE_NODE;
t1->r_child.t = t2;
- } else {
+ } else { /* append a simple expression */
a_simple_expression->value = a_field_component->str;
a_field_component = g_string_new("");
t2->left = LTTV_TREE_LEAF;
t1->r_child.t = t2;
}
break;
+
case '!': /* not, or not equal (math op) */
- if(expression[i+1] == '=') { /* != */
- a_simple_expression->op = LTTV_FIELD_NE;
- i++;
+
+ if(filter->expression[i+1] == '=') { /* != */
g_ptr_array_add( a_field_path,(gpointer) a_field_component );
parse_field_path(a_field_path,a_simple_expression);
a_field_component = g_string_new("");
+ assign_operator(a_simple_expression,LTTV_FIELD_NE);
+ i++;
} else { /* ! */
// g_print("%s\n",a_field_component);
// a_field_component = g_string_new("");
t1->r_child.t = t2;
}
break;
+
case '(': /* start of parenthesis */
case '[':
case '{':
+
p_nesting++; /* incrementing parenthesis nesting value */
t1 = lttv_filter_tree_new();
g_ptr_array_add( tree_stack,(gpointer) t1 );
break;
+
case ')': /* end of parenthesis */
case ']':
case '}':
+
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",expression);
- return NULL;
+ is not valid due to parenthesis incorrect use",filter->expression);
+ return FALSE;
}
g_assert(tree_stack->len>0);
- if(subtree != NULL) {
+ if(subtree != NULL) { /* append subtree to current tree */
t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
while(t1->right != LTTV_TREE_IDLE && t1->right != LTTV_TREE_LEAF) {
g_assert(t1!=NULL && t1->r_child.t != NULL);
t1->r_child.t = subtree;
subtree = g_ptr_array_index(tree_stack,tree_stack->len-1);
g_ptr_array_remove_index(tree_stack,tree_stack->len-1);
- } else {
+ } else { /* assign subtree as current tree */
a_simple_expression->value = a_field_component->str;
a_field_component = g_string_new("");
t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
* mathematic operators
*/
case '<': /* lower, lower or equal */
- if(expression[i+1] == '=') { /* <= */
- i++;
- a_simple_expression->op = LTTV_FIELD_LE;
- } else a_simple_expression->op = LTTV_FIELD_LT;
+
g_ptr_array_add( a_field_path,(gpointer) a_field_component );
parse_field_path(a_field_path,a_simple_expression);
a_field_component = g_string_new("");
- break;
- case '>': /* higher, higher or equal */
- if(expression[i+1] == '=') { /* >= */
+ if(filter->expression[i+1] == '=') { /* <= */
i++;
- a_simple_expression->op = LTTV_FIELD_GE;
- } else a_simple_expression->op = LTTV_FIELD_GT;
+ assign_operator(a_simple_expression,LTTV_FIELD_LE);
+ } else assign_operator(a_simple_expression,LTTV_FIELD_LT);
+ break;
+
+ case '>': /* higher, higher or equal */
+
g_ptr_array_add( a_field_path,(gpointer) a_field_component );
parse_field_path(a_field_path,a_simple_expression);
a_field_component = g_string_new("");
- break;
+ if(filter->expression[i+1] == '=') { /* >= */
+ i++;
+ assign_operator(a_simple_expression,LTTV_FIELD_GE);
+ } else assign_operator(a_simple_expression,LTTV_FIELD_GT);
+ break;
+
case '=': /* equal */
- a_simple_expression->op = LTTV_FIELD_EQ;
+
g_ptr_array_add( a_field_path,(gpointer) a_field_component );
parse_field_path(a_field_path,a_simple_expression);
a_field_component = g_string_new("");
+ assign_operator(a_simple_expression,LTTV_FIELD_EQ);
break;
+
/*
* Field concatening caracter
*/
case '.': /* dot */
- g_ptr_array_add( a_field_path,(gpointer) a_field_component );
- a_field_component = g_string_new("");
+
+ /*
+ * divide field expression into elements
+ * in a_field_path array.
+ */
+ if(a_simple_expression->op != NULL) {
+ g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+ a_field_component = g_string_new("");
+ }
break;
+
default: /* concatening current string */
- g_string_append_c(a_field_component,expression[i]);
+ 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",expression);
- return NULL;
+ is not valid due to parenthesis incorrect use",filter->expression);
+ return FALSE;
}
if(tree_stack->len != 1) /* only root tree should remain */
- return NULL;
+ return FALSE;
/* processing last element of expression */
t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
g_assert(tree != NULL);
g_assert(subtree == NULL);
- lttv_filter_tracefile(tree,NULL);
-
- return tree;
+ lttv_filter_tracefile(filter, NULL) ;
+
+ return TRUE;
+// return filter;
}
+/**
+ * Destroy the current LttvFilter
+ * @param filter pointer to the current LttvFilter
+ */
void
lttv_filter_destroy(LttvFilter* filter) {
-
+
+ g_free(filter->expression);
+ lttv_filter_tree_destroy(filter->head);
+ g_free(filter);
+
}
/**
* or sub expression
* @return pointer of LttvFilterTree
*/
-LttvFilterTree* lttv_filter_tree_new() {
+LttvFilterTree*
+lttv_filter_tree_new() {
LttvFilterTree* tree;
tree = g_new(LttvFilter,1);
tree->node = 0; //g_new(lttv_expression,1);
-// tree->node->type = LTTV_UNDEFINED_EXPRESSION;
tree->left = LTTV_TREE_IDLE;
tree->right = LTTV_TREE_IDLE;
* Destroys the tree and his sub-trees
* @param tree Tree which must be destroyed
*/
-void lttv_filter_tree_destroy(LttvFilterTree* tree) {
+void
+lttv_filter_tree_destroy(LttvFilterTree* tree) {
if(tree == NULL) return;
* managing an array of all items to be removed ..
*/
+ /////////////////////////////////////////////////////////////////////////////
+ // TEST //
+ /////////////////////////////////////////////////////////////////////////////
g_print("node:%p lchild:%p rchild:%p\n",t,t->l_child.t,t->r_child.t);
g_print("node type%i\n",t->node);
if(t->left == LTTV_TREE_NODE) lttv_filter_tracefile(t->l_child.t,NULL);
g_assert(t->r_child.leaf->value != NULL);
g_print("%p: right is qqch %i %s\n",t,t->r_child.leaf->op,t->r_child.leaf->value);
}
+ /////////////////////////////////////////////////////////////////////////////
+
+
+
/* test */
/* int i, nb;