X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ffilter.h;h=49d97981576b0181bc75997934c1af183337d475;hb=0305fe774206ec12a98378be3cf891446b1b901c;hp=fcc2d78c005c635fe7d85290e7c7fa6109b59547;hpb=ffd088ef1210d2beb43272f92cac85b7c6bfbae2;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/filter.h b/ltt/branches/poly/lttv/lttv/filter.h
index fcc2d78c..49d97981 100644
--- a/ltt/branches/poly/lttv/lttv/filter.h
+++ b/ltt/branches/poly/lttv/lttv/filter.h
@@ -104,21 +104,22 @@ enum _LttvFieldType {
   LTTV_FILTER_STATE_CT,               /**< state.creation_time (double) */
   LTTV_FILTER_STATE_IT,               /**< state.insertion_time (double) */
   LTTV_FILTER_STATE_P_NAME,           /**< state.process_name (char*) */
+  LTTV_FILTER_STATE_T_BRAND,          /**< state.thread_brand (char*) */
   LTTV_FILTER_STATE_EX_MODE,          /**< state.execution_mode (LttvExecutionMode) */
   LTTV_FILTER_STATE_EX_SUBMODE,       /**< state.execution_submode (LttvExecutionSubmode) */
   LTTV_FILTER_STATE_P_STATUS,         /**< state.process_status (LttvProcessStatus) */
   LTTV_FILTER_STATE_CPU,              /**< state.cpu (?last_cpu?) */
   LTTV_FILTER_EVENT_NAME,             /**< event.name (char*) */
-  LTTV_FILTER_EVENT_FACILITY,         /**< event.facility (char*) */
   LTTV_FILTER_EVENT_CATEGORY,         /**< FIXME: not implemented */
   LTTV_FILTER_EVENT_TIME,             /**< event.time (double) */
   LTTV_FILTER_EVENT_TSC,              /**< event.tsc (double) */
-  LTTV_FILTER_EVENT_FIELD,            /**< dynamic field, specified in core.xml */
+  LTTV_FILTER_EVENT_TARGET_PID,       /**< event.target_pid (guint) */
+  LTTV_FILTER_EVENT_FIELD,            /**< dynamic field, specified in facility */
   LTTV_FILTER_UNDEFINED               /**< undefined field */
 };
   
 /**
- * 	@enum _LttvExpressionOp
+ *   @enum _LttvExpressionOp
  *  @brief Contains possible operators
  *
  *  This enumeration defines the 
@@ -128,12 +129,12 @@ enum _LttvFieldType {
  */
 enum _LttvExpressionOp
 { 
-  LTTV_FIELD_EQ,	                    /**< equal */
-  LTTV_FIELD_NE,	                    /**< not equal */
-  LTTV_FIELD_LT,	                    /**< lower than */
-  LTTV_FIELD_LE,	                    /**< lower or equal */
-  LTTV_FIELD_GT,	                    /**< greater than */
-  LTTV_FIELD_GE		                    /**< greater or equal */
+  LTTV_FIELD_EQ,                      /**< equal */
+  LTTV_FIELD_NE,                      /**< not equal */
+  LTTV_FIELD_LT,                      /**< lower than */
+  LTTV_FIELD_LE,                      /**< lower or equal */
+  LTTV_FIELD_GT,                      /**< greater than */
+  LTTV_FIELD_GE                        /**< greater or equal */
 };
 
 /**
@@ -147,6 +148,7 @@ enum _LttvExpressionOp
  *  'operators' functions
  */
 union _LttvFieldValue {
+  GQuark  v_quark;                    /**< GQuark */
   guint64 v_uint64;                   /**< unsigned int of 64 bytes */
   guint32 v_uint32;                   /**< unsigned int of 32 bytes */
   guint16 v_uint16;                   /**< unsigned int of 16 bytes */
@@ -338,7 +340,9 @@ gboolean lttv_filter_tree_parse(
         const LttEvent* event,
         const LttTracefile* tracefile,
         const LttTrace* trace,
-        const LttvTracefileContext* context);
+        const LttvTracefileContext* context,
+	const LttvProcessState* pstate,
+	const LttvTraceContext* tc);
 
 gboolean lttv_filter_tree_parse_branch(
         const LttvSimpleExpression* se,