RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:08:10 +00:00
Code Issues Activity Actions

ping: Don't call exit() from within closing_statistics()

Browse source 
This improves readability slightly, as it isn't immediately obvious
that calling this function terminates the program.
This commit is contained in:
Tim Ledbetter 2023-05-28 07:01:53 +01:00 • committed by Andreas Kling
parent e74324ad34
commit d89e23d63e
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Utilities/ping.cpp
View file

@ -39,7 +39,7 @@ static timespec interval_timespec { .tv_sec = 1, .tv_nsec = 0 };
static constexpr int max_optional_header_size_in_bytes = 40; static constexpr int max_optional_header_size_in_bytes = 40;
static constexpr int min_header_size_in_bytes = 5; static constexpr int min_header_size_in_bytes = 5;
static void closing_statistics() static void print_closing_statistics()
{ {
int packet_loss = 100; int packet_loss = 100;
@ -57,8 +57,6 @@ static void closing_statistics()
if (successful_pings) if (successful_pings)
average_ms = total_ms / successful_pings; average_ms = total_ms / successful_pings;
outln("rtt min/avg/max = {}/{}/{} ms", min_ms, average_ms, max_ms); outln("rtt min/avg/max = {}/{}/{} ms", min_ms, average_ms, max_ms);
exit(0);
}; };
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
@ -133,7 +131,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
uint16_t seq = 1; uint16_t seq = 1;
TRY(Core::System::signal(SIGINT, [](int) { TRY(Core::System::signal(SIGINT, [](int) {
closing_statistics(); print_closing_statistics();
exit(0);
})); }));
for (;;) { for (;;) {
@ -235,9 +234,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
total_pings++; total_pings++;
if (count.has_value() && total_pings == count.value()) if (count.has_value() && total_pings == count.value()) {
closing_statistics(); print_closing_statistics();
break;
}
clock_nanosleep(CLOCK_MONOTONIC, 0, &interval_timespec, nullptr); clock_nanosleep(CLOCK_MONOTONIC, 0, &interval_timespec, nullptr);
} }
return 0;
} }