summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fieldstat.cpp5
-rw-r--r--src/file_output.cpp4
-rw-r--r--src/line_protocol_output.cpp7
3 files changed, 6 insertions, 10 deletions
diff --git a/src/fieldstat.cpp b/src/fieldstat.cpp
index 9b411e6..d89ff5a 100644
--- a/src/fieldstat.cpp
+++ b/src/fieldstat.cpp
@@ -201,7 +201,9 @@ void metric_free(struct metric *metric)
{
metric->table = NULL;
}
- free_heavy_keeper(&metric->heavy_keeper);
+ if (metric->field_type == FIELD_TYPE_TOPK) {
+ free_heavy_keeper(&metric->heavy_keeper);
+ }
free(metric);
@@ -515,7 +517,6 @@ long long hdr_count_le_value(const struct hdr_histogram* h, long long value)
void fieldstat_passive_output(struct fieldstat_instance *instance)
{
- printf("enter fieldstat_passive_output\n");
struct timespec this_output_time;
long long interval_ms = 0;
int ret = 0;
diff --git a/src/file_output.cpp b/src/file_output.cpp
index 5165155..8697856 100644
--- a/src/file_output.cpp
+++ b/src/file_output.cpp
@@ -789,7 +789,8 @@ void output_file_type_topk_default(struct fieldstat_instance *instance, int curr
// default
int size = 10000 * metric_num;
- char print_buf[size] = "";
+ char print_buf[size];
+ memset(print_buf, 0, size);
int used_len = 0;
const char *header[TOPK_COLUMN_NUM] = {"rank", "key", NULL};
@@ -813,7 +814,6 @@ void output_file_type_topk_default(struct fieldstat_instance *instance, int curr
int file_output(struct fieldstat_instance *instance,long long interval_ms)
{
- printf("enter file_output\n");
int used_len = 0;
int current_table_cnt = 0;
int current_metric_cnt = 0;
diff --git a/src/line_protocol_output.cpp b/src/line_protocol_output.cpp
index 2e49ed1..99c1de0 100644
--- a/src/line_protocol_output.cpp
+++ b/src/line_protocol_output.cpp
@@ -307,16 +307,11 @@ void output_line_protocol_topk(struct fieldstat_instance *instance, struct metri
used_len += add_user_tag_set(metric, line_buf + used_len, line_buf_size - used_len);
used_len += snprintf(line_buf + used_len, line_buf_size - used_len, " ");
- printf("remaining line_buf_size: %zu\n", line_buf_size - used_len);
- // TODO: <key>=value,<key>=value...
heavy_keeper_archieve_before_output(metric);
struct heavy_keeper *hk = choose_heavy_keeper_for_output(metric);
used_len += add_field_set_for_topk(hk, line_buf + used_len, line_buf_size - used_len);
- if (used_len == 0) {
- printf("ERROR: line protocol has no space in UDP buffer for writing field."); // line protocol packet has at lease one field
- }
- used_len += snprintf(line_buf + used_len, line_buf_size - used_len, "\n"); // TODO: 这个回车是干嘛的?
+ used_len += snprintf(line_buf + used_len, line_buf_size - used_len, "\n");
send_line_buf(&instance->line_protocol_output, line_buf, used_len);
}