put vax headers in their place

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

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 91e9178..323539d 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.27    82/01/24        */
+/*     uipc_mbuf.c     1.38    82/10/09        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -8,15 +8,11 @@
 #include "../h/cmap.h"
 #include "../h/map.h"
 #include "../h/mbuf.h"
 #include "../h/cmap.h"
 #include "../h/map.h"
 #include "../h/mbuf.h"

-#include "../net/in_systm.h"           /* XXX */

 #include "../h/vm.h"
 
 mbinit()
 {
 
 #include "../h/vm.h"
 
 mbinit()
 {
 

-COUNT(MBINIT);
-       if (m_reserve(32) == 0)
-               goto bad;

        if (m_clalloc(4, MPG_MBUFS) == 0)
                goto bad;
        if (m_clalloc(32, MPG_CLUSTERS) == 0)
        if (m_clalloc(4, MPG_MBUFS) == 0)
                goto bad;
        if (m_clalloc(32, MPG_CLUSTERS) == 0)


@@ -36,7 +32,6 @@ m_clalloc(ncl, how)
        register int i;
        int s;
 
        register int i;
        int s;
 

-COUNT(M_CLALLOC);

        npg = ncl * CLSIZE;
        s = splimp();           /* careful: rmalloc isn't reentrant */
        mbx = rmalloc(mbmap, npg);
        npg = ncl * CLSIZE;
        s = splimp();           /* careful: rmalloc isn't reentrant */
        mbx = rmalloc(mbmap, npg);


@@ -44,7 +39,7 @@ COUNT(M_CLALLOC);
        if (mbx == 0)
                return (0);
        m = cltom(mbx / CLSIZE);
        if (mbx == 0)
                return (0);
        m = cltom(mbx / CLSIZE);

-       if (memall(&Mbmap[mbx], ncl * CLSIZE, proc, CSYS) == 0)
+       if (memall(&Mbmap[mbx], npg, proc, CSYS) == 0)

                return (0);
        vmaccess(&Mbmap[mbx], (caddr_t)m, npg);
        switch (how) {
                return (0);
        vmaccess(&Mbmap[mbx], (caddr_t)m, npg);
        switch (how) {


@@ -56,7 +51,7 @@ COUNT(M_CLALLOC);
                        m->m_next = mclfree;
                        mclfree = m;
                        m += CLBYTES / sizeof (*m);
                        m->m_next = mclfree;
                        mclfree = m;
                        m += CLBYTES / sizeof (*m);

-                       nmclfree++;
+                       mbstat.m_clfree++;

                }
                mbstat.m_clusters += ncl;
                splx(s);
                }
                mbstat.m_clusters += ncl;
                splx(s);


@@ -66,10 +61,10 @@ COUNT(M_CLALLOC);
                for (i = ncl * CLBYTES / sizeof (*m); i > 0; i--) {
                        m->m_off = 0;
                        m->m_free = 0;
                for (i = ncl * CLBYTES / sizeof (*m); i > 0; i--) {
                        m->m_off = 0;
                        m->m_free = 0;

+                       mbstat.m_mbufs++;

                        (void) m_free(m);
                        m++;
                }
                        (void) m_free(m);
                        m++;
                }

-               mbstat.m_clusters += ncl;

                break;
        }
        return ((caddr_t)m);
                break;
        }
        return ((caddr_t)m);


@@ -80,15 +75,14 @@ m_pgfree(addr, n)
        int n;
 {
 
        int n;
 {
 

-COUNT(M_PGFREE);
+#ifdef lint
+       addr = addr; n = n;
+#endif

 }
 
 m_expand()
 {
 
 }
 
 m_expand()
 {
 

-COUNT(M_EXPAND);
-       if (mbstat.m_bufs >= mbstat.m_hiwat)
-               return (0);

        if (m_clalloc(1, MPG_MBUFS) == 0)
                goto steal;
        return (1);
        if (m_clalloc(1, MPG_MBUFS) == 0)
                goto steal;
        return (1);


@@ -99,28 +93,6 @@ steal:
 
 /* NEED SOME WAY TO RELEASE SPACE */
 
 
 /* NEED SOME WAY TO RELEASE SPACE */
 

-/*
- * Space reservation routines
- */
-m_reserve(mbufs)
-       int mbufs;
-{
-
-       if (mbstat.m_lowat + (mbufs>>1) > (NMBCLUSTERS-32) * CLBYTES) 
-               return (0);
-       mbstat.m_hiwat += mbufs;
-       mbstat.m_lowat = mbstat.m_hiwat >> 1;
-       return (1);
-}
-
-m_release(mbufs)
-       int mbufs;
-{
-
-       mbstat.m_hiwat -= mbufs;
-       mbstat.m_lowat = mbstat.m_hiwat >> 1;
-}
-

 /*
  * Space allocation routines.
  * These are also available as macros
 /*
  * Space allocation routines.
  * These are also available as macros


@@ -132,7 +104,6 @@ m_get(canwait)
 {
        register struct mbuf *m;
 
 {
        register struct mbuf *m;
 

-COUNT(M_GET);

        MGET(m, canwait);
        return (m);
 }
        MGET(m, canwait);
        return (m);
 }


@@ -143,11 +114,9 @@ m_getclr(canwait)
 {
        register struct mbuf *m;
 
 {
        register struct mbuf *m;
 

-COUNT(M_GETCLR);

        m = m_get(canwait);
        if (m == 0)
                return (0);
        m = m_get(canwait);
        if (m == 0)
                return (0);

-       m->m_off = MMINOFF;

        bzero(mtod(m, caddr_t), MLEN);
        return (m);
 }
        bzero(mtod(m, caddr_t), MLEN);
        return (m);
 }


@@ -158,7 +127,6 @@ m_free(m)
 {
        register struct mbuf *n;
 
 {
        register struct mbuf *n;
 

-COUNT(M_FREE);

        MFREE(m, n);
        return (n);
 }
        MFREE(m, n);
        return (n);
 }


@@ -170,7 +138,6 @@ m_more(type)
 {
        register struct mbuf *m;
 
 {
        register struct mbuf *m;
 

-COUNT(M_MORE);

        if (!m_expand()) {
                mbstat.m_drops++;
                return (NULL);
        if (!m_expand()) {
                mbstat.m_drops++;
                return (NULL);


@@ -187,7 +154,6 @@ m_freem(m)
        register struct mbuf *n;
        register int s;
 
        register struct mbuf *n;
        register int s;
 

-COUNT(M_FREEM);

        if (m == NULL)
                return;
        s = splimp();
        if (m == NULL)
                return;
        s = splimp();


@@ -208,7 +174,6 @@ m_copy(m, off, len)
 {
        register struct mbuf *n, **np;
        struct mbuf *top, *p;
 {
        register struct mbuf *n, **np;
        struct mbuf *top, *p;

-COUNT(M_COPY);

 
        if (len == 0)
                return (0);
 
        if (len == 0)
                return (0);


@@ -239,11 +204,9 @@ COUNT(M_COPY);
                        p = mtod(m, struct mbuf *);
                        n->m_off = ((int)p - (int)n) + off;
                        mclrefcnt[mtocl(p)]++;
                        p = mtod(m, struct mbuf *);
                        n->m_off = ((int)p - (int)n) + off;
                        mclrefcnt[mtocl(p)]++;

-               } else {
-                       n->m_off = MMINOFF;
+               } else

                        bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
                            (unsigned)n->m_len);
                        bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
                            (unsigned)n->m_len);

-               }

                if (len != M_COPYALL)
                        len -= n->m_len;
                off = 0;
                if (len != M_COPYALL)
                        len -= n->m_len;
                off = 0;


@@ -259,20 +222,21 @@ nospace:
 m_cat(m, n)
        register struct mbuf *m, *n;
 {
 m_cat(m, n)
        register struct mbuf *m, *n;
 {

-

        while (m->m_next)
                m = m->m_next;
        while (m->m_next)
                m = m->m_next;

-       while (n)
-               if (m->m_off + m->m_len + n->m_len <= MMAXOFF) {
-                       bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-                           (u_int)n->m_len);
-                       m->m_len += n->m_len;
-                       n = m_free(n);
-               } else {
+       while (n) {
+               if (m->m_off >= MMAXOFF ||
+                   m->m_off + m->m_len + n->m_len > MMAXOFF) {
+                       /* just join the two chains */

                        m->m_next = n;
                        m->m_next = n;

-                       m = n;
-                       n = m->m_next;
+                       return;

                }
                }

+               /* splat the data from one into the other */
+               bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
+                   (u_int)n->m_len);
+               m->m_len += n->m_len;
+               n = m_free(n);
+       }

 }
 
 m_adj(mp, len)
 }
 
 m_adj(mp, len)


@@ -281,7 +245,6 @@ m_adj(mp, len)
 {
        register struct mbuf *m, *n;
 
 {
        register struct mbuf *m, *n;
 

-COUNT(M_ADJ);

        if ((m = mp) == NULL)
                return;
        if (len >= 0) {
        if ((m = mp) == NULL)
                return;
        if (len >= 0) {


@@ -322,25 +285,25 @@ m_pullup(m0, len)
        int len;
 {
        register struct mbuf *m, *n;
        int len;
 {
        register struct mbuf *m, *n;

-       int cnt;
+       int count;

 
 

+       n = m0;

        if (len > MLEN)
                goto bad;
        if (len > MLEN)
                goto bad;

-       MGET(m, 0);
+       MGET(m, M_DONTWAIT);

        if (m == 0)
                goto bad;
        if (m == 0)
                goto bad;

-       m->m_off = MMINOFF;

        m->m_len = 0;
        m->m_len = 0;

-       n = m0;

        do {
        do {

-               cnt = MIN(MLEN - m->m_len, len);
-               if (cnt > n->m_len)
-                       cnt = n->m_len;
-               bcopy(mtod(n, caddr_t), mtod(m, caddr_t)+m->m_len, cnt);
-               len -= cnt;
-               m->m_len += cnt;
-               n->m_off += cnt;
-               n->m_len -= cnt;
+               count = MIN(MLEN - m->m_len, len);
+               if (count > n->m_len)
+                       count = n->m_len;
+               bcopy(mtod(n, caddr_t), mtod(m, caddr_t)+m->m_len,
+                 (unsigned)count);
+               len -= count;
+               m->m_len += count;
+               n->m_off += count;
+               n->m_len -= count;

                if (n->m_len)
                        break;
                n = m_free(n);
                if (n->m_len)
                        break;
                n = m_free(n);


@@ -352,6 +315,6 @@ m_pullup(m0, len)
        m->m_next = n;
        return (m);
 bad:
        m->m_next = n;
        return (m);
 bad:

-       m_freem(m0);
+       m_freem(n);

        return (0);
 }
        return (0);
 }