From: Michael Pronath Date: Fri, 19 Jan 2001 22:24:46 +0000 (+0000) Subject: STABLE10-linux24-shutdown-listener-cleanly-20010119 X-Git-Tag: openafs-stable-1_0_2~2 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=816f0a687aed3625c113e78a3a42662472ac6fa6;p=packages%2Fo%2Fopenafs.git STABLE10-linux24-shutdown-listener-cleanly-20010119 iDon't garbage collection listener pid too early on shutdown (cherry picked from commit d88ed238288fc1914f5bf8968bb68b2d97ef9eea) --- diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 37a39f41f..e7307e2be 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -176,7 +176,11 @@ void osi_StopListener(void) if (rxk_ListenerPid) { (void) (*sys_killp)(rxk_ListenerPid, 9); +#ifdef AFS_LINUX24_ENV + afs_osi_Sleep(&rxk_ListenerPid); +#else rxk_ListenerPid = 0; +#endif } sock_release(rx_socket); rx_socket = NULL; diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index f377feec6..005664ddc 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -969,6 +969,9 @@ void rxk_Listener(void) afs_osi_Wakeup(&afs_termState); } rxk_ListenerPid = 0; +#ifdef AFS_LINUX24_ENV + afs_osi_Wakeup(&rxk_ListenerPid); +#endif #ifdef AFS_SUN5_ENV AFS_GUNLOCK(); #endif /* AFS_SUN5_ENV */