purge COUNT crap now that we have gprof

[unix-history] / usr / src / sys / kern / uipc_socket.c

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 5a313d4..150ba40 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*     uipc_socket.c   4.35    82/03/19        */
+/*     uipc_socket.c   4.42    82/06/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -16,6 +16,7 @@
 #include "../h/ioctl.h"
 #include "../net/in.h"
 #include "../net/in_systm.h"
 #include "../h/ioctl.h"
 #include "../net/in.h"
 #include "../net/in_systm.h"

+#include "../net/route.h"

 
 /*
  * Socket support routines.
 
 /*
  * Socket support routines.


@@ -37,7 +38,6 @@ socreate(aso, type, asp, asa, options)
        register struct socket *so;
        struct mbuf *m;
        int pf, proto, error;
        register struct socket *so;
        struct mbuf *m;
        int pf, proto, error;

-COUNT(SOCREATE);

 
        /*
         * Use process standard protocol/protocol family if none
 
        /*
         * Use process standard protocol/protocol family if none


@@ -81,7 +81,10 @@ COUNT(SOCREATE);
        so->so_proto = prp;
        error = (*prp->pr_usrreq)(so, PRU_ATTACH, 0, asa);
        if (error) {
        so->so_proto = prp;
        error = (*prp->pr_usrreq)(so, PRU_ATTACH, 0, asa);
        if (error) {

-               (void) m_free(dtom(so));
+               if (so->so_snd.sb_mbmax || so->so_rcv.sb_mbmax)
+                       panic("socreate");
+               so->so_state |= SS_USERGONE;
+               sofree(so);

                return (error);
        }
        *aso = so;
                return (error);
        }
        *aso = so;


@@ -92,7 +95,6 @@ sofree(so)
        struct socket *so;
 {
 
        struct socket *so;
 {
 

-COUNT(SOFREE);

        if (so->so_pcb || (so->so_state & SS_USERGONE) == 0)
                return;
        sbrelease(&so->so_snd);
        if (so->so_pcb || (so->so_state & SS_USERGONE) == 0)
                return;
        sbrelease(&so->so_snd);


@@ -113,7 +115,6 @@ soclose(so, exiting)
 {
        int s = splnet();               /* conservative */
 
 {
        int s = splnet();               /* conservative */
 

-COUNT(SOCLOSE);

        if (so->so_pcb == 0)
                goto discard;
        if (exiting)
        if (so->so_pcb == 0)
                goto discard;
        if (exiting)


@@ -142,36 +143,25 @@ COUNT(SOCLOSE);
                }
        }
 drop:
                }
        }
 drop:

-       u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, 0, 0);
+       if (so->so_pcb) {
+               u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, 0, 0);
+               if (exiting == 0 && u.u_error) {
+                       splx(s);
+                       return;
+               }
+       }

 discard:
        so->so_state |= SS_USERGONE;
        sofree(so);
        splx(s);
 }
 
 discard:
        so->so_state |= SS_USERGONE;
        sofree(so);
        splx(s);
 }
 

-sosplice(pso, so)
-       struct socket *pso, *so;
-{
-
-COUNT(SOSPLICE);
-       if (pso->so_proto->pr_family != PF_UNIX) {
-               struct socket *tso;
-               tso = pso; pso = so; so = tso;
-       }
-       if (pso->so_proto->pr_family != PF_UNIX)
-               return (EOPNOTSUPP);
-       /* check types and buffer space */
-       /* merge buffers */
-       return (0);
-}
-

 /*ARGSUSED*/
 sostat(so, sb)
        struct socket *so;
        struct stat *sb;
 {
 
 /*ARGSUSED*/
 sostat(so, sb)
        struct socket *so;
        struct stat *sb;
 {
 

-COUNT(SOSTAT);

        bzero((caddr_t)sb, sizeof (*sb));               /* XXX */
        return (0);                                     /* XXX */
 }
        bzero((caddr_t)sb, sizeof (*sb));               /* XXX */
        return (0);                                     /* XXX */
 }


@@ -186,7 +176,6 @@ soaccept(so, asa)
        int s = splnet();
        int error;
 
        int s = splnet();
        int error;
 

-COUNT(SOACCEPT);

        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                error = EINVAL;                 /* XXX */
                goto bad;
        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                error = EINVAL;                 /* XXX */
                goto bad;


@@ -214,7 +203,6 @@ soconnect(so, asa)
        int s = splnet();
        int error;
 
        int s = splnet();
        int error;
 

-COUNT(SOCONNECT);

        if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) {
                error = EISCONN;
                goto bad;
        if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) {
                error = EISCONN;
                goto bad;


@@ -238,7 +226,6 @@ sodisconnect(so, asa)
        int s = splnet();
        int error;
 
        int s = splnet();
        int error;
 

-COUNT(SODISCONNECT);

        if ((so->so_state & SS_ISCONNECTED) == 0) {
                error = ENOTCONN;
                goto bad;
        if ((so->so_state & SS_ISCONNECTED) == 0) {
                error = ENOTCONN;
                goto bad;


@@ -270,23 +257,26 @@ sosend(so, asa)
        register u_int len;
        int error = 0, space, s;
 
        register u_int len;
        int error = 0, space, s;
 

-COUNT(SOSEND);
-       if (so->so_state & SS_CANTSENDMORE) {
-               psignal(u.u_procp, SIGPIPE);
-               return (EPIPE);
-       }

        if (sosendallatonce(so) && u.u_count > so->so_snd.sb_hiwat)
                return (EMSGSIZE);
        if (sosendallatonce(so) && u.u_count > so->so_snd.sb_hiwat)
                return (EMSGSIZE);

+#ifdef notdef
+       /* NEED TO PREVENT BUSY WAITING IN SELECT FOR WRITING */

        if ((so->so_snd.sb_flags & SB_LOCK) && (so->so_state & SS_NBIO))
                return (EWOULDBLOCK);
        if ((so->so_snd.sb_flags & SB_LOCK) && (so->so_state & SS_NBIO))
                return (EWOULDBLOCK);

+#endif
+restart:

        sblock(&so->so_snd);
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
        sblock(&so->so_snd);
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 

-       s = splnet();

 again:
 again:

+       s = splnet();
+       if (so->so_state & SS_CANTSENDMORE) {
+               psignal(u.u_procp, SIGPIPE);
+               snderr(EPIPE);
+       }

        if (so->so_error) {
                error = so->so_error;
        if (so->so_error) {
                error = so->so_error;

-               so->so_error = 0;
+               so->so_error = 0;                               /* ??? */

                splx(s);
                goto release;
        }
                splx(s);
                goto release;
        }


@@ -298,11 +288,11 @@ again:
        }
        if (top) {
                error = (*so->so_proto->pr_usrreq)(so, PRU_SEND, top, asa);
        }
        if (top) {
                error = (*so->so_proto->pr_usrreq)(so, PRU_SEND, top, asa);

+               top = 0;

                if (error) {
                        splx(s);
                        goto release;
                }
                if (error) {
                        splx(s);
                        goto release;
                }

-               top = 0;

                mp = ⊤
        }
        if (u.u_count == 0) {
                mp = ⊤
        }
        if (u.u_count == 0) {


@@ -316,14 +306,13 @@ again:
                sbunlock(&so->so_snd);
                sbwait(&so->so_snd);
                splx(s);
                sbunlock(&so->so_snd);
                sbwait(&so->so_snd);
                splx(s);

-               goto again;
+               goto restart;

        }
        splx(s);
        while (u.u_count && space > 0) {
                MGET(m, 1);
                if (m == NULL) {
        }
        splx(s);
        while (u.u_count && space > 0) {
                MGET(m, 1);
                if (m == NULL) {

-                       error = ENOBUFS;
-                       m_freem(top);
+                       error = ENOBUFS;                        /* SIGPIPE? */

                        goto release;
                }
                if (u.u_count >= CLBYTES && space >= CLBYTES) {
                        goto release;
                }
                if (u.u_count >= CLBYTES && space >= CLBYTES) {


@@ -344,11 +333,12 @@ nopages:
                mp = &m->m_next;
                space = sbspace(&so->so_snd);
        }
                mp = &m->m_next;
                space = sbspace(&so->so_snd);
        }

-       s = splnet();

        goto again;
 
 release:
        sbunlock(&so->so_snd);
        goto again;
 
 release:
        sbunlock(&so->so_snd);

+       if (top)
+               m_freem(top);

        return (error);
 }
 
        return (error);
 }
 


@@ -361,7 +351,6 @@ soreceive(so, asa)
        int eor, s, error = 0, cnt = u.u_count;
        caddr_t base = u.u_base;
 
        int eor, s, error = 0, cnt = u.u_count;
        caddr_t base = u.u_base;
 

-COUNT(SORECEIVE);

 restart:
        sblock(&so->so_rcv);
        s = splnet();
 restart:
        sblock(&so->so_rcv);
        s = splnet();


@@ -470,7 +459,6 @@ soioctl(so, cmd, cmdp)
        register caddr_t cmdp;
 {
 
        register caddr_t cmdp;
 {
 

-COUNT(SOIOCTL);

        switch (cmd) {
 
        case FIONBIO: {
        switch (cmd) {
 
        case FIONBIO: {


@@ -619,6 +607,22 @@ COUNT(SOIOCTL);
                }
                return;
        }
                }
                return;
        }

+
+       /* routing table update calls */
+       case SIOCADDRT:
+       case SIOCDELRT:
+       case SIOCCHGRT: {
+               struct rtentry route;
+               if (!suser())
+                       return;
+               if (copyin(cmdp, (caddr_t)&route, sizeof (route))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               u.u_error = rtrequest(cmd, &route);
+               return;
+       }
+

        /* type/protocol specific ioctls */
        }
        u.u_error = EOPNOTSUPP;
        /* type/protocol specific ioctls */
        }
        u.u_error = EOPNOTSUPP;