mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

pping: Always initialize JSON array

Browse Source 
Create start of JSON array during the start of program (if configured
to use JSON format) instead of at report. This ensures that
ePPing provides valid JSON output (an empty array, []) even if the
program is stopped before any report is generated. Before this change,
ePPing could generate empty output (""), which is not valid JSON
output, if it was stopped before the first report.

Signed-off-by: Simon Sundberg <simon.sundberg@kau.se>
This commit is contained in:
Simon Sundberg
2023-06-16 19:51:11 +02:00
parent 989905e870
commit 5a8eb8748a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pping/pping.c
View File

@ -1013,11 +1013,6 @@ static void print_event_json(const union pping_event *e)
if (e->event_type != EVENT_TYPE_RTT && e->event_type != EVENT_TYPE_FLOW)
return;
if (!json_ctx) {
json_ctx = jsonw_new(stdout);
jsonw_start_array(json_ctx);
}
jsonw_start_object(json_ctx);
print_common_fields_json(json_ctx, e);
if (e->event_type == EVENT_TYPE_RTT)
@ -1826,6 +1821,11 @@ int main(int argc, char *argv[])
output_format_to_str(config.output_format),
tracked_protocols_to_str(&config), config.ifname);
if (config.output_format == PPING_OUTPUT_JSON) {
json_ctx = jsonw_new(stdout);
jsonw_start_array(json_ctx);
}
if (config.bpf_config.agg_rtts)
fprintf(stderr,
"Aggregating RTTs in histograms with %llu %.6g ms wide bins every %.9g seconds\n",
@ -1839,7 +1839,7 @@ int main(int argc, char *argv[])
if (sigfd < 0) {
fprintf(stderr, "Failed creating signalfd: %s\n",
get_libbpf_strerror(sigfd));
return EXIT_FAILURE;
goto cleanup_output;
}
err = load_attach_bpfprogs(&obj, &config);
@ -1904,11 +1904,6 @@ int main(int argc, char *argv[])
}
// Cleanup
if (config.output_format == PPING_OUTPUT_JSON && json_ctx) {
jsonw_end_array(json_ctx);
jsonw_destroy(&json_ctx);
}
cleanup_epfd:
close(epfd);
@ -1957,5 +1952,11 @@ cleanup_attached_progs:
cleanup_sigfd:
close(sigfd);
cleanup_output:
if (config.output_format == PPING_OUTPUT_JSON && json_ctx) {
jsonw_end_array(json_ctx);
jsonw_destroy(&json_ctx);
}
return err != 0 || detach_err != 0;
}