summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2023-05-25 13:43:32 +1000
committerKinseyMoore <48726349+KinseyMoore@users.noreply.github.com>2023-05-25 07:40:24 -0500
commit0cfe2d278631d4283c9c7e2e7315e002db0ce37b (patch)
treef9b03065757f8a6653f89bea148c613cbdd2416d
parentbsd/ntp: Fix the handling of max active fd when removing the max fd (diff)
downloadrtems-net-services-0cfe2d278631d4283c9c7e2e7315e002db0ce37b.tar.bz2
bsd/ntp: Only clean up in the finish safe handler
- Clean up the internal requests workers before the workers
-rw-r--r--bsd/freebsd/contrib/ntp/ntpd/ntpd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/bsd/freebsd/contrib/ntp/ntpd/ntpd.c b/bsd/freebsd/contrib/ntp/ntpd/ntpd.c
index ffaed30..a08330c 100644
--- a/bsd/freebsd/contrib/ntp/ntpd/ntpd.c
+++ b/bsd/freebsd/contrib/ntp/ntpd/ntpd.c
@@ -1594,8 +1594,8 @@ static void
rtems_ntpd_cleanup(void) {
rtems_ntp_peer_globals_fini();
rtems_ntp_control_globals_fini();
- rtems_ntp_worker_globals_fini();
rtems_ntp_intres_globals_fini();
+ rtems_ntp_worker_globals_fini();
rtems_ntp_proto_globals_fini();
rtems_ntp_io_globals_fini();
rtems_ntp_request_globals_fini();
@@ -1638,7 +1638,6 @@ rtems_ntpd_run(int argc, char **argv)
rtems_mutex_unlock(&ntpd_lock);
r = rtems_bsd_program_call_main("ntpd", ntpdmain, argc, argv);
rtems_mutex_lock(&ntpd_lock);
- rtems_ntpd_cleanup();
ntpd_running = false;
rtems_mutex_unlock(&ntpd_lock);
return r;