diff options
| author |   provos <provos@openbsd.org> | 2001-11-27 22:53:19 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 2001-11-27 22:53:19 +0000 |
| commit | 8f4b9dbe7a07bb37764756719012e057040edfe6 (patch) | |
| tree | 8a65a0ec8994908ad1ce07839cd93521f7107085 /sys/kern/uipc_socket2.c | |
| parent | Various pmap_k* optimizations, as well as uvm interface updates, (diff) | |
| download | wireguard-openbsd-8f4b9dbe7a07bb37764756719012e057040edfe6.tar.xz wireguard-openbsd-8f4b9dbe7a07bb37764756719012e057040edfe6.zip | |
change socket allocation to pool allocator; from netbsd; okay niklas@
Diffstat (limited to 'sys/kern/uipc_socket2.c')
| -rw-r--r-- | sys/kern/uipc_socket2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 5b8d6e19efc..5ea887dfbca 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.21 2001/11/27 15:51:36 provos Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.22 2001/11/27 22:53:19 provos Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -149,6 +149,8 @@ soisdisconnected(so) * then we allocate a new structure, properly linked into the * data structure of the original socket, and return this. * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED. + * + * Must be called at splsoftnet() */ struct socket * sonewconn(head, connstatus) @@ -160,7 +162,7 @@ sonewconn(head, connstatus) if (head->so_qlen + head->so_q0len > head->so_qlimit * 3) return ((struct socket *)0); - MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT); + so = pool_get(&socket_pool, PR_NOWAIT); if (so == NULL) return ((struct socket *)0); bzero((caddr_t)so, sizeof(*so)); @@ -180,7 +182,7 @@ sonewconn(head, connstatus) if ((*so->so_proto->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)) { (void) soqremque(so, soqueue); - (void) free((caddr_t)so, M_SOCKET); + pool_put(&socket_pool, so); return ((struct socket *)0); } if (connstatus) { |