fixed seg fault in tree compilation for filter
[lttv.git] / ltt / branches / poly / lttv / lttv / filter.c
index 4ed2eb1b289966432658fba6314a6c00f692b355..b5addcf07b117b093fe8fb75b39ea2a7187d5bc8 100644 (file)
 
 /*
  *  YET TO BE ANSWERED
- *  - should all the structures and field types be associated with GQuarks
+ *  - the exists an other lttv_filter which conflicts with this one 
+ */
+
+/*
+ *  TODO 
+ *  - refine switch of expression in multiple uses functions
+ *  - add the current simple expression to the tree
  */
 
 #include <lttv/filter.h>
@@ -58,7 +64,53 @@ GQuark
   LTTV_FILTER_TRACESET,
   LTTV_FILTER_TRACEFILE,
   LTTV_FILTER_STATE,
-  LTTV_FILTER_EVENT;
+  LTTV_FILTER_EVENT,
+  LTTV_FILTER_NAME,
+  LTTV_FILTER_CATEGORY,
+  LTTV_FILTER_TIME,
+  LTTV_FILTER_TSC,
+  LTTV_FILTER_PID,
+  LTTV_FILTER_PPID,
+  LTTV_FILTER_C_TIME,
+  LTTV_FILTER_I_TIME,
+  LTTV_FILTER_P_NAME,
+  LTTV_FILTER_EX_MODE,
+  LTTV_FILTER_EX_SUBMODE,
+  LTTV_FILTER_P_STATUS,
+  LTTV_FILTER_CPU;
+  
+/**
+ *  Assign a new tree for the current expression
+ *  or sub expression
+ *  @return pointer of lttv_filter_tree
+ */
+lttv_filter_tree* lttv_filter_tree_new() {
+  lttv_filter_tree* tree;
+
+  tree = g_new(lttv_filter_tree,1);
+  tree->node = g_new(lttv_expression,1);
+  tree->node->type = LTTV_UNDEFINED_EXPRESSION;
+  tree->left = LTTV_TREE_UNDEFINED;
+  tree->right = LTTV_TREE_UNDEFINED;
+
+  return tree;
+}
+
+/**
+ *  Destroys the tree and his sub-trees
+ *  @param tree Tree which must be destroyed
+ */
+void lttv_filter_tree_destroy(lttv_filter_tree* tree) {
+
+  if(tree->left == LTTV_TREE_LEAF) g_free(tree->l_child.leaf);
+  else if(tree->left == LTTV_TREE_NODE) lttv_filter_tree_destroy(tree->l_child.t);
+
+  if(tree->right == LTTV_TREE_LEAF) g_free(tree->r_child.leaf);
+  else if(tree->right == LTTV_TREE_NODE) lttv_filter_tree_destroy(tree->r_child.t);
+
+  g_free(tree->node);
+  g_free(tree);
+}
 
 /**
  *  Parse through filtering field hierarchy as specified 
@@ -68,31 +120,25 @@ GQuark
  *  @return success/failure of operation
  */
 gboolean
-parse_field_path(GList* fp) {
+parse_field_path(GPtrArray* fp) {
 
-  GString* f = g_list_first(fp)->data; 
+  GString* f = NULL;
+  g_assert(f=g_ptr_array_index(fp,0)); //list_first(fp)->data; 
   
-  switch(g_quark_try_string(f->str)) {
-//    case LTTV_FILTER_TRACE:
-//
-//    break;
-//    case LTTV_FILTER_TRACEFILE:
-//
-//      break;
-//    case LTTV_FILTER_TRACESET:
-//
-//      break;
-//    case LTTV_FILTER_STATE:
-//
-//      break;
-//    case LTTV_FILTER_EVENT:
-//
-//      break;
-    default:    /* Quark value unrecognized or equal to 0 */
-      g_warning("Unrecognized field in filter string");
-      return FALSE;
+  if(g_quark_try_string(f->str) == LTTV_FILTER_EVENT) {
+//    parse_subfield(fp, LTTV_FILTER_EVENT);   
+
+  } else if(g_quark_try_string(f->str) == LTTV_FILTER_TRACEFILE) {
+    
+  } else if(g_quark_try_string(f->str) == LTTV_FILTER_TRACE) {
+
+  } else if(g_quark_try_string(f->str) == LTTV_FILTER_STATE) {
+
+  } else {
+    g_warning("Unrecognized field in filter string");
+    return FALSE;
   }
-  return TRUE;
+  return TRUE;  
 }
 
 /**
@@ -116,42 +162,41 @@ parse_simple_expression(GString* expression) {
  *     @param t pointer to the current LttvTrace
  *     @return the current lttv_filter or NULL if error
  */
-lttv_filter*
+lttv_filter_tree*
 lttv_filter_new(char *expression, LttvTraceState *tcs) {
 
   g_print("filter::lttv_filter_new()\n");              /* debug */
 
   unsigned     
     i, 
-    p=0,       /* parenthesis nesting value */
+    p_nesting=0,       /* parenthesis nesting value */
     b=0;       /* current breakpoint in expression string */
        
-    
-  gpointer tree = NULL;
+  /* 
+   * Main tree & Tree concatening list 
+   * each element of the list
+   * is a sub tree created 
+   * by the use of parenthesis in the 
+   * global expression.  The final tree 
+   * will be the one created at the root of 
+   * the list
+   */
+  lttv_filter_tree* tree = lttv_filter_tree_new(); 
+  lttv_filter_tree* subtree = NULL;
+  GPtrArray *tree_stack = g_ptr_array_new();
+  g_ptr_array_add( tree_stack,(gpointer) tree );
   
   /* temporary values */
   GString *a_field_component = g_string_new(""); 
-  GList *a_field_path = NULL;
+  GPtrArray *a_field_path = NULL;
+    
   lttv_simple_expression a_simple_expression;
   
-  /*   
-   *  1. parse expression
-   *  2. construct binary tree
-   *  3. return corresponding filter
-   */
-
-  /*
-   *   Binary tree memory allocation
-   *   - based upon a preliminary block size
-   */
-  gulong size = (strlen(expression)/AVERAGE_EXPRESSION_LENGTH)*MAX_FACTOR;
-  tree = g_malloc(size*sizeof(lttv_filter_tree));
-    
   /*
    *   Parse entire expression and construct
    *   the binary tree.  There are two steps 
    *   in browsing that string
-   *     1. finding boolean ops ( &,|,^,! ) and parenthesis
+   *     1. finding boolean ops " &,|,^,! " and parenthesis " {,(,[,],),} "
    *     2. finding simple expressions
    *       - field path ( separated by dots )
    *       - op ( >, <, =, >=, <=, !=)
@@ -160,17 +205,63 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
    *   string is parsed in this loop for a 
    *   O(n) complexity order.
    */
+
+  /*
+   *  When encountering logical op &,|,^
+   *    1. parse the last value if any
+   *    2. create a new tree
+   *    3. add the expression (simple exp, or exp (subtree)) to the tree
+   *    4. concatenate this tree with the current tree on top of the stack
+   *  When encountering math ops >,>=,<,<=,=,!=
+   *    1. add to op to the simple expression
+   *    2. concatenate last field component to field path
+   *  When encountering concatening ops .
+   *    1. concatenate last field component to field path
+   *  When encountering opening parenthesis (,{,[
+   *    1. create a new subtree on top of tree stack
+   *  When encountering closing parenthesis ),},]
+   *    1. add the expression on right child of the current tree
+   *    2. the subtree is completed, allocate a new subtree
+   *    3. pop the tree value from the tree stack
+   */
+  
+  a_field_path = g_ptr_array_new();
+  g_ptr_array_set_size(a_field_path,2);   /* by default, recording 2 field expressions */
+
+  lttv_filter_tree *t1, *t2;
+  
   for(i=0;i<strlen(expression);i++) {
-    g_print("%s\n",a_field_component->str);
+//    g_print("%s\n",a_field_component->str);
+    g_print("%c ",expression[i]);
     switch(expression[i]) {
       /*
        *   logical operators
        */
       case '&':   /* and */
+        t1 = (lttv_filter_tree*)g_ptr_array_index(tree_stack,tree_stack->len-1);
+        while(t1->right != LTTV_TREE_UNDEFINED) t1 = t1->r_child.t;
+        t2 = lttv_filter_tree_new();
+        t2->node->type = LTTV_EXPRESSION_OP;
+        t2->node->e.op = LTTV_LOGICAL_AND;
+        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 = g_new(lttv_simple_expression,1);
+          t1->right = LTTV_TREE_NODE;
+          t1->r_child.t = t2; 
+        }
+        
+        break;
       case '|':   /* or */
+        break;
       case '^':   /* xor */
-        g_list_append( a_field_path, a_field_component );
-        a_field_component = g_string_new("");
         break;
       case '!':   /* not, or not equal (math op) */
         if(expression[i+1] == '=') {  /* != */
@@ -182,10 +273,57 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
         }
         break;
       case '(':   /* start of parenthesis */
-        p++;      /* incrementing parenthesis nesting value */
+      case '[':
+      case '{':
+        p_nesting++;      /* incrementing parenthesis nesting value */
+        lttv_filter_tree* subtree = lttv_filter_tree_new();
+        g_ptr_array_add( tree_stack,(gpointer) subtree );
         break;
       case ')':   /* end of parenthesis */
-        p--;      /* decrementing parenthesis nesting value */
+      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;
+        }
+        
+        g_assert(tree_stack->len>0);
+        if(subtree != NULL) { 
+          t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
+          while(t1->right != LTTV_TREE_UNDEFINED && t1->right != LTTV_TREE_LEAF) {
+              g_assert(t1!=NULL && t1->r_child.t != NULL);
+              t1 = t1->r_child.t;
+          }
+          t1->right = LTTV_TREE_NODE;
+          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 {
+          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);
+          while(t1->right != LTTV_TREE_UNDEFINED) t1 = t1->r_child.t;
+          t1->right = LTTV_TREE_LEAF;
+          t1->r_child.leaf = g_new(lttv_simple_expression,1);
+          subtree = g_ptr_array_index(tree_stack,tree_stack->len-1);
+          g_ptr_array_remove_index(tree_stack,tree_stack->len-1);
+        }
+      /*  lttv_filter_tree *sub1 = g_ptr_array_index(tree_list,tree_list->len-1);
+        lttv_filter_tree *sub2 = g_ptr_array_index(tree_list,tree_list->len);
+        if(sub1->left == LTTV_TREE_UNDEFINED){ 
+          sub1->l_child.t = sub2;
+          sub1->left = LTTV_TREE_NODE;
+        } else if(sub1->right == LTTV_TREE_UNDEFINED){
+          sub1->r_child.t = sub2; 
+          sub1->right = LTTV_TREE_NODE;
+        } else g_error("error during tree assignation");
+        g_ptr_array_remove_index(tree_list,tree_list->len);
+        break;
+        */
+      //  subtree = g_ptr_array_index(tree_stack,tree_stack->len);
+      //  g_ptr_array_remove_index(tree_stack,tree_stack->len);
         break;
 
       /*       
@@ -194,37 +332,62 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
       case '<':   /* lower, lower or equal */
         if(expression[i+1] == '=') { /* <= */
           i++;
-          a_simple_expression.op = LTTV_FIELD_LE;                  
+          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 );
+        a_field_component = g_string_new("");         
         break;
       case '>':   /* higher, higher or equal */
         if(expression[i+1] == '=') {  /* >= */
           i++;
-          a_simple_expression.op = LTTV_FIELD_GE;                  
+          a_simple_expression.op = LTTV_FIELD_GE;        
         } else a_simple_expression.op = LTTV_FIELD_GT;
+        g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+        a_field_component = g_string_new("");         
         break;
       case '=':   /* equal */
         a_simple_expression.op = LTTV_FIELD_EQ;
+        g_ptr_array_add( a_field_path,(gpointer) a_field_component );
+        a_field_component = g_string_new("");         
         break;
       /*
        *  Field concatening caracter
        */
       case '.':   /* dot */
-        g_list_append( a_field_path, a_field_component );
+        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]);                            
     }
   }
-
-
+  /*  processing last element of expression   */
+  g_assert(tree_stack->len==1); /* only root tree should remain */
+  t1 = g_ptr_array_index(tree_stack,tree_stack->len-1);
+  while(t1->right != LTTV_TREE_UNDEFINED) t1 = t1->r_child.t;
+  if(subtree != NULL) {  /* add the subtree */
+    t1->right = LTTV_TREE_NODE;
+    t1->l_child.t = subtree;
+    subtree = NULL;
+  } else {  /* add a leaf */
+    a_simple_expression.value = a_field_component->str;
+    a_field_component = g_string_new("");
+    t1->right = LTTV_TREE_LEAF;
+    t1->r_child.leaf = g_new(lttv_simple_expression,1);
+  }
+  
+  g_assert(tree != NULL);
+  g_assert(subtree == NULL); 
   
-  if( p>0 ) { 
+  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;
   }
+
+  return tree;
+  
 }
 
 /**
@@ -234,7 +397,7 @@ lttv_filter_new(char *expression, LttvTraceState *tcs) {
  *     @return success/failure of operation
  */
 gboolean
-lttv_filter_tracefile(lttv_filter *filter, LttTracefile *tracefile) {
+lttv_filter_tracefile(lttv_filter_t *filter, LttTracefile *tracefile) {
 
   
   
@@ -265,7 +428,7 @@ lttv_filter_tracefile(lttv_filter *filter, LttTracefile *tracefile) {
 }
 
 gboolean
-lttv_filter_tracestate(lttv_filter *filter, LttvTraceState *tracestate) {
+lttv_filter_tracestate(lttv_filter_t *filter, LttvTraceState *tracestate) {
 
 }
 
@@ -276,28 +439,61 @@ lttv_filter_tracestate(lttv_filter *filter, LttvTraceState *tracestate) {
  *     @return success/failure of operation
  */
 gboolean
-lttv_filter_event(lttv_filter *filter, LttEvent *event) {
+lttv_filter_event(lttv_filter_t *filter, LttEvent *event) {
 
 }
 
+/**
+ *  Initializes the filter module and specific values
+ */
 static void module_init()
 {
-  LTTV_FILTER_EVENT = g_quark_from_string("event");
-  LTTV_FILTER_TRACE = g_quark_from_string("trace");
-  LTTV_FILTER_TRACESET = g_quark_from_string("traceset");
-  LTTV_FILTER_STATE = g_quark_from_string("state");
-  LTTV_FILTER_TRACEFILE = g_quark_from_string("tracefile");
+
+  /* 
+   *  Quarks initialization
+   *  for hardcoded filtering options
+   *
+   *  TODO: traceset has no yet been defined
+   */
+  
+  /* top fields */
+  LTTV_FILTER_EVENT = g_quark_from_string("event"); 
+  LTTV_FILTER_TRACE = g_quark_from_string("trace"); 
+  LTTV_FILTER_TRACESET = g_quark_from_string("traceset"); 
+  LTTV_FILTER_STATE = g_quark_from_string("state"); 
+  LTTV_FILTER_TRACEFILE = g_quark_from_string("tracefile"); 
  
+  /* event.name, tracefile.name, trace.name */
+  LTTV_FILTER_NAME = g_quark_from_string("name");
+
+  /* event sub fields */
+  LTTV_FILTER_CATEGORY = g_quark_from_string("category"); 
+  LTTV_FILTER_TIME = g_quark_from_string("time"); 
+  LTTV_FILTER_TSC = g_quark_from_string("tsc"); 
+
+  /* state sub fields */
+  LTTV_FILTER_PID = g_quark_from_string("pid"); 
+  LTTV_FILTER_PPID = g_quark_from_string("ppid"); 
+  LTTV_FILTER_C_TIME = g_quark_from_string("creation_time");  
+  LTTV_FILTER_I_TIME = g_quark_from_string("insertion_time"); 
+  LTTV_FILTER_P_NAME = g_quark_from_string("process_name"); 
+  LTTV_FILTER_EX_MODE = g_quark_from_string("execution_mode");  
+  LTTV_FILTER_EX_SUBMODE = g_quark_from_string("execution_submode");
+  LTTV_FILTER_P_STATUS = g_quark_from_string("process_status");
+  LTTV_FILTER_CPU = g_quark_from_string("cpu");
+  
 }
 
+/**
+ *  Destroys the filter module and specific values
+ */
 static void module_destroy() 
 {
 }
 
 
-//LTTV_MODULE("filter", \
-    "", \
-    "", \
+LTTV_MODULE("filter", "Filters traceset and events", \
+    "Filters traceset and events specifically to user input", \
     module_init, module_destroy)
 
 
This page took 0.028037 seconds and 4 git commands to generate.