diff options
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 9cede13a10c..8625fbe818f 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -25,8 +25,6 @@ #include "dbcache.h" #include "zbxjson.h" -#define TRIGGER_EPSILON 0.000001 - #define MACRO_TYPE_MESSAGE_NORMAL 0x0001 #define MACRO_TYPE_MESSAGE_RECOVERY 0x0002 #define MACRO_TYPE_TRIGGER_URL 0x0004 @@ -46,14 +44,16 @@ #define STR_CONTAINS_MACROS(str) (NULL != strchr(str, '{')) -int evaluate_function(char *value, DB_ITEM *item, const char *function, const char *parameters, time_t now); +void get_functionids(zbx_vector_uint64_t *functionids, const char *expression); + +int evaluate_function(char *value, DC_ITEM *item, const char *function, const char *parameters, time_t now, + char **error); int substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, DB_EVENT *r_event, zbx_uint64_t *userid, zbx_uint64_t *hostid, DC_HOST *dc_host, DC_ITEM *dc_item, char **data, int macro_type, char *error, int maxerrlen); void evaluate_expressions(zbx_vector_ptr_t *triggers); -int evaluate(double *value, char *exp, char *error, int maxerrlen); void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, const char *units, unsigned char value_type); @@ -66,6 +66,4 @@ int substitute_discovery_macros(char **data, struct zbx_json_parse *jp_row, int int substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, struct zbx_json_parse *jp_row, int macro_type, char *error, size_t mexerrlen); -int translate_expression(const char *expression, char **opcode, char **error); - #endif |