diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:47 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:57 +0000 |
commit | 00151562145df50cc65e9902d52d5fa77f89fe50 (patch) | |
tree | 2737716802f6725a5074d606ec8fe5422c58a83c /web/api/queries/rrdr.h | |
parent | Releasing debian version 1.34.1-1. (diff) | |
download | netdata-00151562145df50cc65e9902d52d5fa77f89fe50.tar.xz netdata-00151562145df50cc65e9902d52d5fa77f89fe50.zip |
Merging upstream version 1.35.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | web/api/queries/rrdr.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/web/api/queries/rrdr.h b/web/api/queries/rrdr.h index bd94e56e2..87ba6c86b 100644 --- a/web/api/queries/rrdr.h +++ b/web/api/queries/rrdr.h @@ -83,7 +83,7 @@ typedef struct rrdresult { long resampling_group; calculated_number resampling_divisor; - void *(*grouping_create)(struct rrdresult *r); + void (*grouping_create)(struct rrdresult *r); void (*grouping_reset)(struct rrdresult *r); void (*grouping_free)(struct rrdresult *r); void (*grouping_add)(struct rrdresult *r, calculated_number value); @@ -102,13 +102,14 @@ typedef struct rrdresult { #define rrdr_rows(r) ((r)->rows) #include "database/rrd.h" -extern void rrdr_free(RRDR *r); -extern RRDR *rrdr_create(struct rrdset *st, long n, struct context_param *context_param_list); +extern void rrdr_free(ONEWAYALLOC *owa, RRDR *r); +extern RRDR *rrdr_create(ONEWAYALLOC *owa, struct rrdset *st, long n, struct context_param *context_param_list); #include "../web_api_v1.h" #include "web/api/queries/query.h" extern RRDR *rrd2rrdr( + ONEWAYALLOC *owa, RRDSET *st, long points_requested, long long after_requested, long long before_requested, RRDR_GROUPING group_method, long resampling_time_requested, RRDR_OPTIONS options, const char *dimensions, struct context_param *context_param_list, int timeout); |