[src/kqueue]: src/sys/kern no need to protect the kqueue SLIST manipulation w...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bdacaa553724
branches:  kqueue
changeset: 512452:bdacaa553724
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Mar 15 21:36:11 2002 +0000

description:
no need to protect the kqueue SLIST manipulation with splnet - the
structures are never changed nor accessed from interrupt context
filt_solisten(): g/c the comment about what FreeBSD does, leave only
   comment what the code does (it was checked to be correct)

diffstat:

 sys/kern/uipc_socket.c |  30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)

diffs (92 lines):

diff -r b90d18280852 -r bdacaa553724 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Fri Mar 15 21:02:05 2002 +0000
+++ b/sys/kern/uipc_socket.c    Fri Mar 15 21:36:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.56.2.3 2002/01/10 20:00:14 thorpej Exp $     */
+/*     $NetBSD: uipc_socket.c,v 1.56.2.4 2002/03/15 21:36:11 jdolecek Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.56.2.3 2002/01/10 20:00:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.56.2.4 2002/03/15 21:36:11 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1125,7 +1125,6 @@
 {
        struct socket   *so;
        struct sockbuf  *sb;
-       int             s;
 
        so = (struct socket *)kn->kn_fp->f_data;
        switch (kn->kn_filter) {
@@ -1143,10 +1142,8 @@
        default:
                return (1);
        }
-       s = splnet();           /* XXXLUKEM: maybe splsoftnet() ? */
        SLIST_INSERT_HEAD(&sb->sb_sel.si_klist, kn, kn_selnext);
        sb->sb_flags |= SB_KNOTE;
-       splx(s);
        return (0);
 }
 
@@ -1154,14 +1151,11 @@
 filt_sordetach(struct knote *kn)
 {
        struct socket   *so;
-       int             s;
 
        so = (struct socket *)kn->kn_fp->f_data;
-       s = splnet();           /* XXXLUKEM: maybe splsoftnet() ? */
        SLIST_REMOVE(&so->so_rcv.sb_sel.si_klist, kn, knote, kn_selnext);
        if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_klist))
                so->so_rcv.sb_flags &= ~SB_KNOTE;
-       splx(s);
 }
 
 /*ARGSUSED*/
@@ -1188,14 +1182,11 @@
 filt_sowdetach(struct knote *kn)
 {
        struct socket   *so;
-       int             s;
 
        so = (struct socket *)kn->kn_fp->f_data;
-       s = splnet();           /* XXXLUKEM: maybe splsoftnet() ? */
        SLIST_REMOVE(&so->so_snd.sb_sel.si_klist, kn, knote, kn_selnext);
        if (SLIST_EMPTY(&so->so_snd.sb_sel.si_klist))
                so->so_snd.sb_flags &= ~SB_KNOTE;
-       splx(s);
 }
 
 /*ARGSUSED*/
@@ -1228,20 +1219,11 @@
        struct socket   *so;
 
        so = (struct socket *)kn->kn_fp->f_data;
-#if 0
+
        /*
-        * XXXLUKEM:    this was freebsd's code. it appears that they
-        * XXXLUKEM:    modified the socket code to store the count
-        * XXXLUKEM:    of all connections in so_qlen, and separately
-        * XXXLUKEM:    track the number of incompletes in so_incqlen.
-        * XXXLUKEM:    as we appear to keep only completed connections
-        * XXXLUKEM:    on so_qlen we can just return that.
-        * XXXLUKEM:    that said, a socket guru should double check for me :)
-        */
-       kn->kn_data = so->so_qlen - so->so_incqlen;
-       return (! TAILQ_EMPTY(&so->so_comp));
-#else
+        * Set kn_data to number of incoming connections, not
+        * counting partial (incomplete) connections.
+        */ 
        kn->kn_data = so->so_qlen;
        return (kn->kn_data > 0);
-#endif
 }