projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl_xml: fix 3 small memory leaks
[collectd.git]
/
src
/
utils_match.h
diff --git
a/src/utils_match.h
b/src/utils_match.h
index
a39c869
..
36abe30
100644
(file)
--- a/
src/utils_match.h
+++ b/
src/utils_match.h
@@
-28,8
+28,10
@@
/*
* Defines
*/
/*
* Defines
*/
-#define UTILS_MATCH_DS_TYPE_GAUGE 0x10
-#define UTILS_MATCH_DS_TYPE_COUNTER 0x20
+#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_AVERAGE 0x01
#define UTILS_MATCH_CF_GAUGE_MIN 0x02
@@
-40,6
+42,14
@@
#define UTILS_MATCH_CF_COUNTER_ADD 0x02
#define UTILS_MATCH_CF_COUNTER_INC 0x04
#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
*/
/*
* Data types
*/
@@
-72,8
+82,10
@@
typedef struct cu_match_value_s cu_match_value_t;
* then only the submatch (the part in the parenthesis) will be passed to the
* callback. If there is no submatch, then the entire string is passed to the
* callback.
* then only the submatch (the part in the parenthesis) will be passed to the
* callback. If there is no submatch, then the entire string is passed to the
* callback.
+ * The optional `excluderegex' allows to exclude the line from the match, if
+ * the excluderegex matches.
*/
*/
-cu_match_t *match_create_callback (const char *regex,
+cu_match_t *match_create_callback (const char *regex,
const char *excluderegex,
int (*callback) (const char *str,
char * const *matches, size_t matches_num, void *user_data),
void *user_data);
int (*callback) (const char *str,
char * const *matches, size_t matches_num, void *user_data),
void *user_data);
@@
-102,7
+114,8
@@
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.
*/
* The function will not search for anything in the string and increase
* value.counter by one.
*/
-cu_match_t *match_create_simple (const char *regex, int ds_type);
+cu_match_t *match_create_simple (const char *regex,
+ const char *excluderegex, int ds_type);
/*
* NAME
/*
* NAME
@@
-133,7
+146,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
*
* 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);
*/
void *match_get_user_data (cu_match_t *obj);