From 00c5a213e88b694fc877d59b213536e247f8cc06 Mon Sep 17 00:00:00 2001 From: dmchen Date: Wed, 21 Aug 2024 08:14:44 +0000 Subject: [PATCH] fix/TD-31542-monitorfw --- source/libs/monitorfw/inc/taos_assert.h | 5 ++++- source/libs/monitorfw/src/taos_collector.c | 2 +- source/libs/monitorfw/src/taos_collector_registry.c | 4 ++-- source/libs/monitorfw/src/taos_linked_list.c | 4 ++-- source/libs/monitorfw/src/taos_map.c | 4 ++-- source/libs/monitorfw/src/taos_metric.c | 2 +- source/libs/monitorfw/src/taos_metric_formatter.c | 2 +- source/libs/monitorfw/src/taos_string_builder.c | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/libs/monitorfw/inc/taos_assert.h b/source/libs/monitorfw/inc/taos_assert.h index 9d2732acc5..9fe05e910c 100644 --- a/source/libs/monitorfw/inc/taos_assert.h +++ b/source/libs/monitorfw/inc/taos_assert.h @@ -22,7 +22,10 @@ #ifdef TAOS_ASSERT_ENABLE #define TAOS_ASSERT(i) assert(i); #else -#define TAOS_ASSERT(i) +#define TAOS_ASSERT(i) \ + if (i) return 1; +#define TAOS_ASSERT_NULL(i) \ + if (i) return NULL; #endif // TAOS_TEST #endif // TAOS_ASSERT_H diff --git a/source/libs/monitorfw/src/taos_collector.c b/source/libs/monitorfw/src/taos_collector.c index 01e37b6d76..873e87040d 100644 --- a/source/libs/monitorfw/src/taos_collector.c +++ b/source/libs/monitorfw/src/taos_collector.c @@ -120,7 +120,7 @@ int taos_collector_remove_metric(taos_collector_t *self, const char* key){ } taos_metric_t* taos_collector_get_metric(taos_collector_t *self, char *metric_name){ - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); if (self == NULL) return NULL; return taos_map_get(self->metrics, metric_name); } \ No newline at end of file diff --git a/source/libs/monitorfw/src/taos_collector_registry.c b/source/libs/monitorfw/src/taos_collector_registry.c index 88f56549e5..aa611bf2c5 100644 --- a/source/libs/monitorfw/src/taos_collector_registry.c +++ b/source/libs/monitorfw/src/taos_collector_registry.c @@ -126,7 +126,7 @@ int taos_collector_registry_register_metric(taos_metric_t *metric) { } int taos_collector_registry_deregister_metric(const char *key) { - TAOS_ASSERT(metric != NULL); + TAOS_ASSERT(key != NULL); taos_collector_t *default_collector = (taos_collector_t *)taos_map_get(TAOS_COLLECTOR_REGISTRY_DEFAULT->collectors, "default"); @@ -139,7 +139,7 @@ int taos_collector_registry_deregister_metric(const char *key) { } taos_metric_t *taos_collector_registry_get_metric(char* metric_name){ - TAOS_ASSERT(metric != NULL); + TAOS_ASSERT_NULL(metric_name != NULL); taos_collector_t *default_collector = (taos_collector_t *)taos_map_get(TAOS_COLLECTOR_REGISTRY_DEFAULT->collectors, "default"); diff --git a/source/libs/monitorfw/src/taos_linked_list.c b/source/libs/monitorfw/src/taos_linked_list.c index 7c46e89ab0..01716a18be 100644 --- a/source/libs/monitorfw/src/taos_linked_list.c +++ b/source/libs/monitorfw/src/taos_linked_list.c @@ -69,7 +69,7 @@ int taos_linked_list_destroy(taos_linked_list_t *self) { } void *taos_linked_list_first(taos_linked_list_t *self) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); if (self->head) { return self->head->item; } else { @@ -78,7 +78,7 @@ void *taos_linked_list_first(taos_linked_list_t *self) { } void *taos_linked_list_last(taos_linked_list_t *self) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); if (self->tail) { return self->tail->item; } else { diff --git a/source/libs/monitorfw/src/taos_map.c b/source/libs/monitorfw/src/taos_map.c index 64d5475af2..df0f1b2a8e 100644 --- a/source/libs/monitorfw/src/taos_map.c +++ b/source/libs/monitorfw/src/taos_map.c @@ -199,7 +199,7 @@ static void *taos_map_get_internal(const char *key, size_t *size, size_t *max_si } void *taos_map_get(taos_map_t *self, const char *key) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); int r = 0; r = pthread_rwlock_wrlock(self->rwlock); if (r) { @@ -217,7 +217,7 @@ void *taos_map_get(taos_map_t *self, const char *key) { } void *taos_map_get_withoutlock(taos_map_t *self, const char *key) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); int r = 0; void *payload = taos_map_get_internal(key, &self->size, &self->max_size, self->keys, self->addrs, self->free_value_fn); diff --git a/source/libs/monitorfw/src/taos_metric.c b/source/libs/monitorfw/src/taos_metric.c index f31cef79b0..6c94249573 100644 --- a/source/libs/monitorfw/src/taos_metric.c +++ b/source/libs/monitorfw/src/taos_metric.c @@ -144,7 +144,7 @@ void taos_metric_free_generic(void *item) { } taos_metric_sample_t *taos_metric_sample_from_labels(taos_metric_t *self, const char **label_values) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); int r = 0; r = pthread_rwlock_wrlock(self->rwlock); if (r) { diff --git a/source/libs/monitorfw/src/taos_metric_formatter.c b/source/libs/monitorfw/src/taos_metric_formatter.c index e57c809815..acd53ad251 100644 --- a/source/libs/monitorfw/src/taos_metric_formatter.c +++ b/source/libs/monitorfw/src/taos_metric_formatter.c @@ -193,7 +193,7 @@ int taos_metric_formatter_clear(taos_metric_formatter_t *self) { } char *taos_metric_formatter_dump(taos_metric_formatter_t *self) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); int r = 0; if (self == NULL) return NULL; char *data = taos_string_builder_dump(self->string_builder); diff --git a/source/libs/monitorfw/src/taos_string_builder.c b/source/libs/monitorfw/src/taos_string_builder.c index 208f3f6d51..599533788c 100644 --- a/source/libs/monitorfw/src/taos_string_builder.c +++ b/source/libs/monitorfw/src/taos_string_builder.c @@ -140,7 +140,7 @@ size_t taos_string_builder_len(taos_string_builder_t *self) { } char *taos_string_builder_dump(taos_string_builder_t *self) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); // +1 to accommodate \0 char *out = (char *)taos_malloc((self->len + 1) * sizeof(char)); memcpy(out, self->str, self->len + 1); @@ -148,6 +148,6 @@ char *taos_string_builder_dump(taos_string_builder_t *self) { } char *taos_string_builder_str(taos_string_builder_t *self) { - TAOS_ASSERT(self != NULL); + TAOS_ASSERT_NULL(self != NULL); return self->str; }