Changes on the overall structure of the filter

[lttv.git] / ltt / branches / poly / lttv / lttv / filter.h

diff --git a/ltt/branches/poly/lttv/lttv/filter.h b/ltt/branches/poly/lttv/lttv/filter.h
index ab5b695856b216fc7176e6ad392810ae28b5c865..a108fa8bccb90af45e622400c93a130f73f2b066 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/filter.h
+++ b/ltt/branches/poly/lttv/lttv/filter.h
@@ -22,6 +22,7 @@
 #include <lttv/traceset.h>
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
+#include <lttv/module.h>
 #include <ltt/ltt.h>
 #include <ltt/event.h>
 
@@ -57,8 +58,21 @@ extern 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;
+  
 /**
  *     @enum lttv_expression_op
  */
@@ -75,77 +89,103 @@ typedef enum _lttv_expression_op
 typedef enum _lttv_expression_type
 { 
   LTTV_EXPRESSION,
-  LTTV_SIMPLE_EXPRESSION
+  LTTV_SIMPLE_EXPRESSION,
+  LTTV_EXPRESSION_OP,
+  LTTV_UNDEFINED_EXPRESSION
 } lttv_expression_type;
 
+typedef enum _lttv_tree_element {
+  LTTV_TREE_IDLE,
+  LTTV_TREE_NODE,
+  LTTV_TREE_LEAF
+} lttv_tree_element;
+
 typedef struct _lttv_simple_expression
 { 
-  lttv_expression_op op;
   char *field_name;
+  lttv_expression_op op;
   char *value;
 } lttv_simple_expression;
 
 typedef enum _lttv_logical_op {
-    OR = 1,
-    AND = 1<<1,
-    NOT = 1<<2,
-    XOR = 1<<3
+    LTTV_LOGICAL_OR = 1,         /* 1 */
+    LTTV_LOGICAL_AND = 1<<1,     /* 2 */
+    LTTV_LOGICAL_NOT = 1<<2,     /* 4 */
+    LTTV_LOGICAL_XOR = 1<<3      /* 8 */
 } lttv_logical_op;
     
 /*
  * Ah .. that's my tree
  */
-typedef struct _lttv_expression 
-{ 
-//  gboolean or;
-//  gboolean not;
-//  gboolean and;
-//  gboolean xor;
+//typedef struct _lttv_expression 
+//{ 
 //  gboolean simple_expression;
-  lttv_logical_op op;
+//  int op;
+//  lttv_expression_type type;
+//  union {
+//    struct lttv_expression *e;
+ //   lttv_field_relation *se;  /* --> simple expression */
+//  } e;
+//} lttv_expression;
+
+typedef struct _lttv_expression {
   lttv_expression_type type;
   union {
-    struct lttv_expression *e;
- //   lttv_field_relation *se;  /* --> simple expression */
+    lttv_simple_expression *se;
+    int op;
   } e;
 } lttv_expression;
 
-
-//typedef union _lttv_expression {
-//  lttv_simple_expression se;
-//  
-//} lttv_expression;
-
 typedef struct _lttv_filter_tree {
-       lttv_expression* node;
-       struct lttv_filter_tree* r_child;
-       struct lttv_filter_tree* l_child;
+//     lttv_expression* node;
+  int node;
+  lttv_tree_element left;
+  lttv_tree_element right;
+  union {
+    struct lttv_filter_tree* t;
+    lttv_simple_expression* leaf;
+  } l_child;
+  union {
+    struct lttv_filter_tree* t;
+    lttv_simple_expression* leaf;
+  } r_child;
 } lttv_filter_tree;
 
 /**
  * @struct lttv_filter
  * ( will later contain a binary tree of filtering options )
  */
-typedef struct _lttv_filter {
+typedef struct _lttv_filter_t {
        lttv_filter_tree* tree; 
-} lttv_filter;
+} lttv_filter_t;
+
+
+lttv_simple_expression* lttv_simple_expression_new();
+
+lttv_filter_tree* lttv_filter_tree_new();
+
+void lttv_filter_tree_destroy(lttv_filter_tree* tree);
+
+void lttv_filter_tree_add_node(GPtrArray* stack, lttv_filter_tree* subtree, lttv_logical_op op);
 
-gboolean parse_field_path(GList* fp);
+/* Parse field path contained in list */
+gboolean parse_field_path(GPtrArray* fp);
 
 gboolean parse_simple_expression(GString* expression);
 
 /* Compile the filter expression into an efficient data structure */
-lttv_filter *lttv_filter_new(char *expression, LttvTraceState *tfs);
+lttv_filter_tree *lttv_filter_new(char *expression, LttvTraceState *tfs);
 
+void lttv_filter_destroy(lttv_filter* filter);
 
 /* Check if the tracefile or event satisfies the filter. The arguments are
    declared as void * to allow these functions to be used as hooks. */
 
-gboolean lttv_filter_tracefile(lttv_filter *filter, LttTracefile *tracefile);
+gboolean lttv_filter_tracefile(lttv_filter_tree *filter, LttTracefile *tracefile);
 
-gboolean lttv_filter_tracestate(lttv_filter *filter, LttvTraceState *tracestate);
+gboolean lttv_filter_tracestate(lttv_filter_t *filter, LttvTraceState *tracestate);
 
-gboolean lttv_filter_event(lttv_filter *filter, LttEvent *event);
+gboolean lttv_filter_event(lttv_filter_t *filter, LttEvent *event);
 
 #endif // FILTER_H