Bump version to 4.9.4; Update ChangeLog.

[collectd.git] / src / utils_match.h

diff --git a/src/utils_match.h b/src/utils_match.h
index 5098e97..e8f02a5 100644 (file)
--- a/src/utils_match.h
+++ b/src/utils_match.h
@@ -28,10 +28,27 @@
 /*
  * Defines
  */
-#define UTILS_MATCH_DS_TYPE_GAUGE       0
-#define UTILS_MATCH_DS_TYPE_COUNTER_SET 1
-#define UTILS_MATCH_DS_TYPE_COUNTER_ADD 2
-#define UTILS_MATCH_DS_TYPE_COUNTER_INC 3
+#define UTILS_MATCH_DS_TYPE_GAUGE    0x10
+#define UTILS_MATCH_DS_TYPE_COUNTER  0x20
+#define UTILS_MATCH_DS_TYPE_DERIVE   0x40
+#define UTILS_MATCH_DS_TYPE_ABSOLUTE 0x80
+
+#define UTILS_MATCH_CF_GAUGE_AVERAGE 0x01
+#define UTILS_MATCH_CF_GAUGE_MIN     0x02
+#define UTILS_MATCH_CF_GAUGE_MAX     0x04
+#define UTILS_MATCH_CF_GAUGE_LAST    0x08
+
+#define UTILS_MATCH_CF_COUNTER_SET   0x01
+#define UTILS_MATCH_CF_COUNTER_ADD   0x02
+#define UTILS_MATCH_CF_COUNTER_INC   0x04
+
+#define UTILS_MATCH_CF_DERIVE_SET   0x01
+#define UTILS_MATCH_CF_DERIVE_ADD   0x02
+#define UTILS_MATCH_CF_DERIVE_INC   0x04
+
+#define UTILS_MATCH_CF_ABSOLUTE_SET   0x01
+#define UTILS_MATCH_CF_ABSOLUTE_ADD   0x02
+#define UTILS_MATCH_CF_ABSOLUTE_INC   0x04
 
 /*
  * Data types
@@ -43,6 +60,7 @@ struct cu_match_value_s
 {
   int ds_type;
   value_t value;
+  unsigned int values_num;
 };
 typedef struct cu_match_value_s cu_match_value_t;
 
@@ -66,12 +84,13 @@ typedef struct cu_match_value_s cu_match_value_t;
  *  callback.
  */
 cu_match_t *match_create_callback (const char *regex,
-               int (*callback) (const char *str, void *user_data),
+               int (*callback) (const char *str,
+                 char * const *matches, size_t matches_num, void *user_data),
                void *user_data);
 
 /*
  * NAME
- *  match_create_callback
+ *  match_create_simple
  *
  * DESCRIPTION
  *  Creates a new `cu_match_t' with a default callback. The user data for that
@@ -93,7 +112,7 @@ cu_match_t *match_create_callback (const char *regex,
  *    The function will not search for anything in the string and increase
  *    value.counter by one.
  */
-cu_match_t *match_create_default (const char *regex, int ds_type);
+cu_match_t *match_create_simple (const char *regex, int ds_type);
 
 /*
  * NAME
@@ -124,7 +143,7 @@ int match_apply (cu_match_t *obj, const char *str);
  *
  * DESCRIPTION
  *  Returns the pointer passed to `match_create_callback' or a pointer to the
- *  `cu_match_value_t' structure allocated by `match_create_callback'.
+ *  `cu_match_value_t' structure allocated by `match_create_simple'.
  */
 void *match_get_user_data (cu_match_t *obj);