d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuked ambiguous sleep message strings:

Browse Source 
old:				new:
	netcls[] = "netcls"		"soclos"
	netcon[] = "netcon"		"accept", "connec"
	netio[] = "netio"		"sblock", "sbwait"
This commit is contained in:
Bruce Evans 1995-12-14 22:51:13 +00:00
parent e0067d71f4
commit 47daf5d5d6
5 changed files with 12 additions and 25 deletions

11
sys/kern/uipc_sockbuf.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
* $Id: uipc_socket2.c,v 1.5 1995/05/30 08:06:22 rgrimes Exp $
* $Id: uipc_socket2.c,v 1.6 1995/11/03 18:33:46 wollman Exp $
*/
#include <sys/param.h>
@ -53,11 +53,6 @@
* Primitive routines for operating on sockets and socket buffers
*/
/* strings for sleep message: */
char netio[] = "netio";
char netcon[] = "netcon";
char netcls[] = "netcls";
u_long sb_max = SB_MAX; /* XXX should be static */
SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "")
@ -280,7 +275,7 @@ sbwait(sb)
sb->sb_flags |= SB_WAIT;
return (tsleep((caddr_t)&sb->sb_cc,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, netio,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait",
sb->sb_timeo));
}
@ -298,7 +293,7 @@ sb_lock(sb)
sb->sb_flags |= SB_WANT;
error = tsleep((caddr_t)&sb->sb_flags,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH,
netio, 0);
"sblock", 0);
if (error)
return (error);
}

4
sys/kern/uipc_socket.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
* $Id: uipc_socket.c,v 1.11 1995/08/25 20:27:46 bde Exp $
* $Id: uipc_socket.c,v 1.12 1995/11/03 18:33:43 wollman Exp $
*/
#include <sys/param.h>
@ -185,7 +185,7 @@ soclose(so)
goto drop;
while (so->so_state & SS_ISCONNECTED) {
error = tsleep((caddr_t)&so->so_timeo,
PSOCK | PCATCH, netcls, so->so_linger);
PSOCK | PCATCH, "soclos", so->so_linger);
if (error)
break;
}

11
sys/kern/uipc_socket2.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
* $Id: uipc_socket2.c,v 1.5 1995/05/30 08:06:22 rgrimes Exp $
* $Id: uipc_socket2.c,v 1.6 1995/11/03 18:33:46 wollman Exp $
*/
#include <sys/param.h>
@ -53,11 +53,6 @@
* Primitive routines for operating on sockets and socket buffers
*/
/* strings for sleep message: */
char netio[] = "netio";
char netcon[] = "netcon";
char netcls[] = "netcls";
u_long sb_max = SB_MAX; /* XXX should be static */
SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "")
@ -280,7 +275,7 @@ sbwait(sb)
sb->sb_flags |= SB_WAIT;
return (tsleep((caddr_t)&sb->sb_cc,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, netio,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait",
sb->sb_timeo));
}
@ -298,7 +293,7 @@ sb_lock(sb)
sb->sb_flags |= SB_WANT;
error = tsleep((caddr_t)&sb->sb_flags,
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH,
netio, 0);
"sblock", 0);
if (error)
return (error);
}

6
sys/kern/uipc_syscalls.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94
* $Id: uipc_syscalls.c,v 1.8 1995/10/11 06:09:45 swallace Exp $
* $Id: uipc_syscalls.c,v 1.9 1995/10/23 15:42:12 bde Exp $
*/
#include <sys/param.h>
@ -192,7 +192,7 @@ accept1(p, uap, retval, compat)
break;
}
error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
netcon, 0);
"accept", 0);
if (error) {
splx(s);
return (error);
@ -297,7 +297,7 @@ connect(p, uap, retval)
s = splnet();
while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
netcon, 0);
"connec", 0);
if (error)
break;
}

5
sys/sys/socketvar.h

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socketvar.h 8.1 (Berkeley) 6/2/93
* $Id: socketvar.h,v 1.7 1995/11/21 12:55:14 bde Exp $
* $Id: socketvar.h,v 1.8 1995/12/14 08:32:36 phk Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
@ -199,9 +199,6 @@ extern u_long sb_max;
#define sonewconn(head, connstatus) sonewconn1((head), (connstatus))
struct socket *sonewconn1 __P((struct socket *head, int connstatus));
/* strings for sleep message: */
extern char netio[], netcon[], netcls[];
/*
* File operations on sockets.
*/