diff options
| author | fumingwei <[email protected]> | 2023-03-23 12:56:03 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2023-03-23 13:19:34 +0800 |
| commit | 08a8907cdb1f7537d95ee144f947a743e2ae697d (patch) | |
| tree | bafe8ec995c59b0e4604986dbf97ce97f1078950 /src | |
| parent | 1b3d40eaa3db4867d71b0908f6121f1f21b8b448 (diff) | |
feature:1.新增执行测试用例执行流程2.新增cppcheck执行流程
Diffstat (limited to 'src')
| -rw-r--r-- | src/fieldstat.cpp | 2 | ||||
| -rw-r--r-- | src/file_output.cpp | 6 | ||||
| -rw-r--r-- | src/line_protocol_output.cpp | 2 | ||||
| -rw-r--r-- | src/prometheus_output.cpp | 10 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/fieldstat.cpp b/src/fieldstat.cpp index 3a8747c..cdb7de9 100644 --- a/src/fieldstat.cpp +++ b/src/fieldstat.cpp @@ -293,7 +293,7 @@ int send_udp(int sd, unsigned int dest_ip, unsigned short dest_port, const char return -1; } } - already_sended_len=+this_sended_len; + already_sended_len += this_sended_len; } return 0; diff --git a/src/file_output.cpp b/src/file_output.cpp index 40d28a1..7289f28 100644 --- a/src/file_output.cpp +++ b/src/file_output.cpp @@ -512,8 +512,10 @@ int fieldstat_output_file(struct fieldstat_instance *instance,long long interval } fseek(instance->local_output_fp, 0, SEEK_SET); - fwrite(print_buf,append_pos - print_buf,1,instance->local_output_fp); - + if(print_buf) + { + fwrite(print_buf, append_pos - print_buf, 1,instance->local_output_fp); + } fflush(instance->local_output_fp); if(print_buf) diff --git a/src/line_protocol_output.cpp b/src/line_protocol_output.cpp index f1b2c16..9a9bfa9 100644 --- a/src/line_protocol_output.cpp +++ b/src/line_protocol_output.cpp @@ -119,7 +119,7 @@ static void output_line_protocol_table(struct fieldstat_instance *instance,int t line_value_is_not_zero = 1; } field_pos += snprintf(field_pos, - sizeof(field_set_buff) - (field_set_buff - field_set_buff), + sizeof(field_set_buff) - (field_pos - field_set_buff), "%s=%lld,", metric->table->column_name[metric->table_column_id], value diff --git a/src/prometheus_output.cpp b/src/prometheus_output.cpp index 8b31ae3..96016c1 100644 --- a/src/prometheus_output.cpp +++ b/src/prometheus_output.cpp @@ -188,12 +188,12 @@ static int prometheus_output_histogram_and_summary(struct metric *metric, char * if(metric->field_type == FILED_TYPE_HISTOGRAM) { - output_format = (char *)"%s_bucket{%s,le=\"%0.2f\"} %llu\n"; + output_format = (char *)"%s_bucket{%s,le=\"%0.2f\"} %lld\n"; } if(metric->field_type == FIELD_TYPE_SUMMARY) { - output_format = (char *)"%s{%s,quantile=\"%0.2f\"} %llu\n"; + output_format = (char *)"%s{%s,quantile=\"%0.2f\"} %lld\n"; } hdr_init(h->lowest_trackable_value, h->highest_trackable_value, h->significant_figures, &(h_tmp)); @@ -224,7 +224,7 @@ static int prometheus_output_histogram_and_summary(struct metric *metric, char * } used_len+=snprintf(payload+used_len, payload_len-used_len, - "%s_count{%s} %llu\n", + "%s_count{%s} %lld\n", metric_name, metric_tags, (long long)h_out->total_count @@ -237,7 +237,7 @@ static int prometheus_output_histogram_and_summary(struct metric *metric, char * } used_len+=snprintf(payload+used_len, payload_len-used_len, - "%s_sum{%s} %llu\n", + "%s_sum{%s} %lld\n", metric_name, metric_tags, sum @@ -329,7 +329,7 @@ static int prometheus_get_instance_metric_playload(struct fieldstat_instance *in value = get_metric_unit_val(metric, FS_CALC_CURRENT, 1); append_offset += snprintf(new_payload + append_offset, new_payload_size - append_offset, - "%s{%s} %llu\n", + "%s{%s} %lld\n", metric_name, metric_tags, value |