From e98b8be3912212943863522fa466edc131993d70 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 7 Oct 2015 22:23:18 +0200 Subject: [PATCH] connection: Drop old and unused conn_node* types. This was part of the old parser implementation. --- src/frontend/connection-private.h | 187 ------------------------------ 1 file changed, 187 deletions(-) diff --git a/src/frontend/connection-private.h b/src/frontend/connection-private.h index acdc699..03e58e5 100644 --- a/src/frontend/connection-private.h +++ b/src/frontend/connection-private.h @@ -83,193 +83,6 @@ struct sdb_conn { }; #define CONN(obj) ((sdb_conn_t *)(obj)) -/* - * node types - */ - -typedef struct { - sdb_conn_node_t super; - sdb_store_expr_t *expr; -} conn_expr_t; -#define CONN_EXPR(obj) ((conn_expr_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - sdb_store_matcher_t *matcher; -} conn_matcher_t; -#define CONN_MATCHER(obj) ((conn_matcher_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - int type; - conn_matcher_t *filter; -} conn_list_t; -#define CONN_LIST(obj) ((conn_list_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - int type; - char *host; - char *name; /* NULL for type == SDB_HOST */ - conn_matcher_t *filter; -} conn_fetch_t; -#define CONN_FETCH(obj) ((conn_fetch_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - int type; - conn_matcher_t *matcher; - conn_matcher_t *filter; -} conn_lookup_t; -#define CONN_LOOKUP(obj) ((conn_lookup_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - char *name; - sdb_time_t last_update; -} conn_store_host_t; -#define CONN_STORE_HOST(obj) ((conn_store_host_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - char *hostname; - char *name; - sdb_time_t last_update; -} conn_store_svc_t; -#define CONN_STORE_SVC(obj) ((conn_store_svc_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - char *hostname; - char *name; - char *store_type; /* optional */ - char *store_id; /* optional */ - sdb_time_t last_update; -} conn_store_metric_t; -#define CONN_STORE_METRIC(obj) ((conn_store_metric_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - int parent_type; - char *hostname; /* optional */ - char *parent; - char *key; - sdb_data_t value; - sdb_time_t last_update; -} conn_store_attr_t; -#define CONN_STORE_ATTR(obj) ((conn_store_attr_t *)(obj)) - -typedef struct { - sdb_conn_node_t super; - char *hostname; - char *metric; - sdb_timeseries_opts_t opts; -} conn_ts_t; -#define CONN_TS(obj) ((conn_ts_t *)(obj)) - -/* - * type helper functions - */ - -static void __attribute__((unused)) -conn_expr_destroy(sdb_object_t *obj) -{ - sdb_object_deref(SDB_OBJ(CONN_EXPR(obj)->expr)); -} /* conn_expr_destroy */ - -static void __attribute__((unused)) -conn_matcher_destroy(sdb_object_t *obj) -{ - sdb_object_deref(SDB_OBJ(CONN_MATCHER(obj)->matcher)); -} /* conn_matcher_destroy */ - -static void __attribute__((unused)) -conn_list_destroy(sdb_object_t *obj) -{ - sdb_object_deref(SDB_OBJ(CONN_LIST(obj)->filter)); -} /* conn_list_destroy */ - -static void __attribute__((unused)) -conn_fetch_destroy(sdb_object_t *obj) -{ - if (CONN_FETCH(obj)->host) - free(CONN_FETCH(obj)->host); - if (CONN_FETCH(obj)->name) - free(CONN_FETCH(obj)->name); - sdb_object_deref(SDB_OBJ(CONN_FETCH(obj)->filter)); -} /* conn_fetch_destroy */ - -static void __attribute__((unused)) -conn_lookup_destroy(sdb_object_t *obj) -{ - sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->matcher)); - sdb_object_deref(SDB_OBJ(CONN_LOOKUP(obj)->filter)); -} /* conn_lookup_destroy */ - -static void __attribute__((unused)) -conn_store_host_destroy(sdb_object_t *obj) -{ - conn_store_host_t *host = CONN_STORE_HOST(obj); - if (host->name) - free((void *)host->name); - host->name = NULL; -} /* conn_store_host_destroy */ - -static void __attribute__((unused)) -conn_store_svc_destroy(sdb_object_t *obj) -{ - conn_store_svc_t *svc = CONN_STORE_SVC(obj); - if (svc->hostname) - free((void *)svc->hostname); - svc->hostname = NULL; - if (svc->name) - free((void *)svc->name); - svc->name = NULL; -} /* conn_store_svc_destroy */ - -static void __attribute__((unused)) -conn_store_metric_destroy(sdb_object_t *obj) -{ - conn_store_metric_t *metric = CONN_STORE_METRIC(obj); - if (metric->hostname) - free((void *)metric->hostname); - metric->hostname = NULL; - if (metric->name) - free((void *)metric->name); - metric->name = NULL; - if (metric->store_type) - free((void *)metric->store_type); - metric->store_type = NULL; - if (metric->store_id) - free((void *)metric->store_id); - metric->store_id = NULL; -} /* conn_store_metric_destroy */ - -static void __attribute__((unused)) -conn_store_attr_destroy(sdb_object_t *obj) -{ - conn_store_attr_t *attr = CONN_STORE_ATTR(obj); - if (attr->hostname) - free((void *)attr->hostname); - attr->hostname = NULL; - if (attr->parent) - free((void *)attr->parent); - attr->parent = NULL; - if (attr->key) - free((void *)attr->key); - attr->key = NULL; - sdb_data_free_datum(&attr->value); -} /* conn_store_attr_destroy */ - -static void __attribute__((unused)) -conn_ts_destroy(sdb_object_t *obj) -{ - if (CONN_TS(obj)->hostname) - free(CONN_TS(obj)->hostname); - if (CONN_TS(obj)->metric) - free(CONN_TS(obj)->metric); -} /* conn_ts_destroy */ - #ifdef __cplusplus } /* extern "C" */ #endif -- 2.30.2