X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.c;h=a614909ed7541026948a7669bf952a338257ee4c;hb=c607371be079c36e281398a753221002c1c4c851;hp=a837317d7913beda14ed4f718aff0c2558c17c37;hpb=6e0d58d62e75ecf147ebadb1e23b927d772e9a3a;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/filter.c b/ltt/branches/poly/lttv/lttv/filter.c
index a837317d..a614909e 100644
--- a/ltt/branches/poly/lttv/lttv/filter.c
+++ b/ltt/branches/poly/lttv/lttv/filter.c
@@ -45,8 +45,8 @@
  *  |->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)
@@ -303,29 +303,29 @@ lttv_simple_expression_assign_operator(LttvSimpleExpression* se, LttvExpressionO
        }
        break;
      /* 
-      * 32 bits unsigned integers
+      * 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_uint32;
+           se->op = lttv_apply_op_eq_uint;
            break;
          case LTTV_FIELD_NE:
-           se->op = lttv_apply_op_ne_uint32;
+           se->op = lttv_apply_op_ne_uint;
            break;
          case LTTV_FIELD_LT:
-           se->op = lttv_apply_op_lt_uint32;
+           se->op = lttv_apply_op_lt_uint;
            break;
          case LTTV_FIELD_LE:
-           se->op = lttv_apply_op_le_uint32;
+           se->op = lttv_apply_op_le_uint;
            break;
          case LTTV_FIELD_GT:
-           se->op = lttv_apply_op_gt_uint32;
+           se->op = lttv_apply_op_gt_uint;
            break;
          case LTTV_FIELD_GE:
-           se->op = lttv_apply_op_ge_uint32;
+           se->op = lttv_apply_op_ge_uint;
            break;
          default:
            g_warning("Error encountered in operator assignment");
@@ -433,12 +433,12 @@ lttv_simple_expression_assign_value(LttvSimpleExpression* se, char* value) {
        g_free(value);
        break;
      /*
-      * 32 bits integer
+      * unsigned integers
       */
      case LTTV_FILTER_STATE_PID:
      case LTTV_FILTER_STATE_PPID:
      case LTTV_FILTER_STATE_CPU:
-       se->value.v_uint32 = atoi(value);
+       se->value.v_uint = atoi(value);
        g_free(value);
        break;
      /*
@@ -546,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) 
  * 
@@ -647,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) 
@@ -747,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) 
@@ -819,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) 
@@ -892,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) 
  * 
@@ -963,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) 
@@ -1511,9 +1593,9 @@ lttv_filter_update(LttvFilter* filter) {
 #endif
   
   /* debug */
-  g_print("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n");
+  g_debug("+++++++++++++++ BEGIN PRINT ++++++++++++++++\n");
   lttv_print_tree(filter->head,0) ;
-  g_print("+++++++++++++++ END PRINT ++++++++++++++++++\n");
+  g_debug("+++++++++++++++ END PRINT ++++++++++++++++++\n");
   
   /* success */
   return TRUE;
@@ -1893,22 +1975,22 @@ lttv_filter_tree_parse_branch(
 void
 lttv_print_tree(const LttvFilterTree* t, const int count) {
 
-  g_print("node:%p lchild:%p rchild:%p depth:%i\n",t, //t->l_child.t,t->r_child.t);
+  g_debug("node:%p lchild:%p rchild:%p depth:%i\n",t, //t->l_child.t,t->r_child.t);
           (t->left==LTTV_TREE_NODE)?t->l_child.t:NULL,
           (t->right==LTTV_TREE_NODE)?t->r_child.t:NULL,
           count);
-  g_print("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE"))));
-  g_print("|-> left branch %p is a %s\n",t->l_child.t,(t->left==LTTV_TREE_NODE)?"NODE":((t->left==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
+  g_debug("logic operator: %s\n",(t->node&1)?"OR":((t->node&2)?"AND":((t->node&4)?"NOT":((t->node&8)?"XOR":"IDLE"))));
+  g_debug("|-> left branch %p is a %s\n",t->l_child.t,(t->left==LTTV_TREE_NODE)?"NODE":((t->left==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
   if(t->left == LTTV_TREE_LEAF) {
-    g_print("| |-> field type number: %i\n",t->l_child.leaf->field);
-    g_print("| |-> offset is: %i\n",t->l_child.leaf->offset);
-    g_print("| |-> operator function is: %p\n",t->l_child.leaf->op);
+    g_debug("| |-> field type number: %i\n",t->l_child.leaf->field);
+    g_debug("| |-> offset is: %i\n",t->l_child.leaf->offset);
+    g_debug("| |-> operator function is: %p\n",t->l_child.leaf->op);
   }
-  g_print("|-> right branch %p is a %s\n",t->r_child.t,(t->right==LTTV_TREE_NODE)?"NODE":((t->right==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
+  g_debug("|-> right branch %p is a %s\n",t->r_child.t,(t->right==LTTV_TREE_NODE)?"NODE":((t->right==LTTV_TREE_LEAF)?"LEAF":"IDLE"));
   if(t->right == LTTV_TREE_LEAF) {
-    g_print("| |-> field type number: %i\n",t->r_child.leaf->field);
-    g_print("| |-> offset is: %i\n",t->r_child.leaf->offset);
-    g_print("| |-> operator function is: %p\n",t->r_child.leaf->op);
+    g_debug("| |-> field type number: %i\n",t->r_child.leaf->field);
+    g_debug("| |-> offset is: %i\n",t->r_child.leaf->offset);
+    g_debug("| |-> operator function is: %p\n",t->r_child.leaf->op);
   }
 
   if(t->left == LTTV_TREE_NODE) lttv_print_tree(t->l_child.t,count+1);