From 028bb07a4a49afe5eb8db3cd928154cd2295e318 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 28 Jan 2002 00:30:31 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r425, which included commits to RCS files with non-trunk default branches. --- src/rx/LINUX/rx_knet.c | 11 +++-------- src/rx/SOLARIS/rx_knet.c | 10 +++++++--- src/rx/rx_kcommon.c | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 53d8c0e09..8228ca709 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -15,7 +15,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/LINUX/rx_knet.c,v 1.1.1.7 2002/01/22 19:54:25 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/LINUX/rx_knet.c,v 1.1.1.8 2002/01/28 00:30:30 hartmans Exp $"); #ifdef AFS_LINUX22_ENV #include "../rx/rx_kcommon.h" @@ -178,14 +178,9 @@ void osi_StopListener(void) extern int (*sys_killp)(); extern int rxk_ListenerPid; - if (rxk_ListenerPid) { + while (rxk_ListenerPid) { (void) (*sys_killp)(rxk_ListenerPid, 9); -#ifdef AFS_LINUX24_ENV - afs_osi_Sleep(&rxk_ListenerPid); /* get an event */ - afs_osi_Sleep(&rxk_ListenerPid); /* actually sleep */ -#else - rxk_ListenerPid = 0; -#endif + afs_osi_Sleep(&rxk_ListenerPid); } sock_release(rx_socket); rx_socket = NULL; diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index 13a46ec9a..8919b9358 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -10,7 +10,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/SOLARIS/rx_knet.c,v 1.1.1.7 2001/10/14 18:06:27 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/SOLARIS/rx_knet.c,v 1.1.1.8 2002/01/28 00:30:31 hartmans Exp $"); #ifdef AFS_SUN5_ENV #include "../rx/rx_kcommon.h" @@ -281,8 +281,10 @@ int osi_FreeSocket(asocket) vnode_t *vp = SOTOV(so); AFS_STATCNT(osi_FreeSocket); - if (rxk_ListenerPid) + while (rxk_ListenerPid) { kill(rxk_ListenerPid, SIGUSR1); + afs_osi_Sleep(&rxk_ListenerPid); + } return 0; } @@ -512,8 +514,10 @@ int osi_FreeSocket(asocket) TIUSER *udp_tiptr = (TIUSER *) asocket; AFS_STATCNT(osi_FreeSocket); - if (rxk_ListenerPid) + if (rxk_ListenerPid) { kill(rxk_ListenerPid, SIGUSR1); + afs_osi_Sleep(&rxk_ListenerPid); + } return 0; } diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 4ac766780..e74da16a4 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -14,7 +14,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_kcommon.c,v 1.1.1.9 2001/10/14 18:06:21 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_kcommon.c,v 1.1.1.10 2002/01/28 00:30:24 hartmans Exp $"); #include "../rx/rx_kcommon.h" @@ -1059,7 +1059,7 @@ void rxk_Listener(void) afs_osi_Wakeup(&afs_termState); } rxk_ListenerPid = 0; -#ifdef AFS_LINUX24_ENV +#if defined(AFS_LINUX22_ENV) || defined(AFS_SUN5_ENV) afs_osi_Wakeup(&rxk_ListenerPid); #endif #ifdef AFS_SUN5_ENV -- 2.39.5