system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-22 17:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix:

Browse source 
The variables "m_mclalloc_wid" and "m_mballoc_wid" were not in the
proper place.  They should have been in uipc_mbuf.c and have been global,
not in mbuf.h and local per each file that uses mbuf.h.

Sorta bug fix:
   In mbuf.h, the definitions of various things for KERNEL and not
KERNEL cases were very screwy.   This fixes all of that which I could
find.
This commit is contained in:
Brian Feldman 1999-12-14 02:23:14 +00:00
parent 883db2a0de
commit 6c54410230
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=54584
2 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/kern/uipc_mbuf.c
View file

@ -66,6 +66,8 @@ int max_hdr;
int max_datalen;
int nmbclusters;
int nmbufs;
u_int m_mballoc_wid = 0;
u_int m_clalloc_wid = 0;
SYSCTL_DECL(_kern_ipc);
SYSCTL_INT(_kern_ipc, KIPC_MAX_LINKHDR, max_linkhdr, CTLFLAG_RW,

80
sys/sys/mbuf.h
View file

@ -153,28 +153,35 @@ struct mbuf {
#define MT_CONTROL 14 /* extra-data protocol message */
#define MT_OOBDATA 15 /* expedited data */
/*
* Mbuf statistics.
*/
struct mbstat {
u_long m_mbufs; /* mbufs obtained from page pool */
u_long m_clusters; /* clusters obtained from page pool */
u_long m_spare; /* spare field */
u_long m_clfree; /* free clusters */
u_long m_drops; /* times failed to find space */
u_long m_wait; /* times waited for space */
u_long m_drain; /* times drained protocols for space */
u_short m_mtypes[256]; /* type specific mbuf allocations */
u_long m_mcfail; /* times m_copym failed */
u_long m_mpfail; /* times m_pullup failed */
u_long m_msize; /* length of an mbuf */
u_long m_mclbytes; /* length of an mbuf cluster */
u_long m_minclsize; /* min length of data to allocate a cluster */
u_long m_mlen; /* length of data in an mbuf */
u_long m_mhlen; /* length of data in a header mbuf */
};
#ifdef KERNEL
/* We'll need wakeup_one(). */
#include <sys/systm.h>
/* flags to m_get/MGET */
#define M_DONTWAIT 1
#define M_WAIT 0
/* mbuf and mbuf cluster wait count variables... */
static u_int m_mballoc_wid = 0, m_clalloc_wid = 0;
static __inline void m_mballoc_wakeup __P((void));
static __inline void m_clalloc_wakeup __P((void));
/* We'll need wakeup_one(). */
#ifdef KERNEL
#include <sys/systm.h>
#endif
/*
* Identifying number passed to the m_mballoc_wait function, allowing
* us to determine that the call came from an MGETHDR and not an MGET --
* this way we are sure to run the MGETHDR macro when the call came from there.
*/
#define MGETHDR_C 1
#define MGET_C 2
/* Freelists:
*
* Normal mbuf clusters are normally treated as character arrays
@ -186,9 +193,18 @@ union mcluster {
char mcl_buf[MCLBYTES];
};
/* mbuf and mbuf cluster wait count variables */
extern u_int m_mballoc_wid;
extern u_int m_clalloc_wid;
/*
* mbuf and mbuf cluster wakeup inline routines.
* Identifying number passed to the m_mballoc_wait function, allowing
* us to determine that the call came from an MGETHDR and not an MGET --
* this way we are sure to run the MGETHDR macro when the call came from there.
*/
#define MGETHDR_C 1
#define MGET_C 2
/*
* Wakeup the next instance -- if any -- of m_mballoc_wait() which
* is waiting for an mbuf to be freed. Make sure to decrement sleep count.
@ -439,28 +455,6 @@ m_clalloc_wakeup(void)
/* compatibility with 4.3 */
#define m_copy(m, o, l) m_copym((m), (o), (l), M_DONTWAIT)
/*
* Mbuf statistics.
*/
struct mbstat {
u_long m_mbufs; /* mbufs obtained from page pool */
u_long m_clusters; /* clusters obtained from page pool */
u_long m_spare; /* spare field */
u_long m_clfree; /* free clusters */
u_long m_drops; /* times failed to find space */
u_long m_wait; /* times waited for space */
u_long m_drain; /* times drained protocols for space */
u_short m_mtypes[256]; /* type specific mbuf allocations */
u_long m_mcfail; /* times m_copym failed */
u_long m_mpfail; /* times m_pullup failed */
u_long m_msize; /* length of an mbuf */
u_long m_mclbytes; /* length of an mbuf cluster */
u_long m_minclsize; /* min length of data to allocate a cluster */
u_long m_mlen; /* length of data in an mbuf */
u_long m_mhlen; /* length of data in a header mbuf */
};
#ifdef KERNEL
extern struct mbuf *mbutl; /* virtual address of mclusters */
extern char *mclrefcnt; /* cluster reference counts */
extern struct mbstat mbstat;
@ -475,7 +469,7 @@ extern int max_hdr; /* largest link+protocol header */
extern int max_datalen; /* MHLEN - max_hdr */
extern int mbuf_wait; /* mbuf sleep time */
struct mbuf *m_mballoc_wait __P((int, int));
struct mbuf *m_mballoc_wait __P((int, int));
struct mbuf *m_copym __P((struct mbuf *, int, int, int));
struct mbuf *m_copypacket __P((struct mbuf *, int));
struct mbuf *m_devget __P((char *, int, int, struct ifnet *,
@ -495,7 +489,7 @@ void m_adj __P((struct mbuf *, int));
void m_cat __P((struct mbuf *,struct mbuf *));
int m_mballoc __P((int, int));
int m_clalloc __P((int, int));
caddr_t m_clalloc_wait __P((void));
caddr_t m_clalloc_wait __P((void));
void m_copyback __P((struct mbuf *, int, int, caddr_t));
void m_copydata __P((struct mbuf *,int,int,caddr_t));
void m_freem __P((struct mbuf *));