Deleted Added
full compact
malloc.h (22975) malloc.h (27221)
1/*
2 * Copyright (c) 1987, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)malloc.h 8.5 (Berkeley) 5/3/95
1/*
2 * Copyright (c) 1987, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)malloc.h 8.5 (Berkeley) 5/3/95
34 * $Id$
34 * $Id: malloc.h,v 1.20 1997/02/22 09:45:32 peter Exp $
35 */
36
37#ifndef _SYS_MALLOC_H_
38#define _SYS_MALLOC_H_
39
40#define KMEMSTATS
41
42/*

--- 86 unchanged lines hidden (view full) ---

129#define M_BIOBUF 82 /* BIO buffer */
130#define M_KTRACE 83 /* KTRACE */
131#define M_SELECT 84 /* select() buffer */
132#define M_GEOM_DEV 85 /* geometry device */
133#define M_GEOM_MOD 86 /* geometry module */
134#define M_GEOM_REQ 87 /* geometry request */
135#define M_GEOM_MISC 88 /* geometry misc */
136#define M_VFSCONF 89 /* vfsconf structure */
35 */
36
37#ifndef _SYS_MALLOC_H_
38#define _SYS_MALLOC_H_
39
40#define KMEMSTATS
41
42/*

--- 86 unchanged lines hidden (view full) ---

129#define M_BIOBUF 82 /* BIO buffer */
130#define M_KTRACE 83 /* KTRACE */
131#define M_SELECT 84 /* select() buffer */
132#define M_GEOM_DEV 85 /* geometry device */
133#define M_GEOM_MOD 86 /* geometry module */
134#define M_GEOM_REQ 87 /* geometry request */
135#define M_GEOM_MISC 88 /* geometry misc */
136#define M_VFSCONF 89 /* vfsconf structure */
137#define M_LAST 90 /* Must be last type + 1 */
137#define M_AIO 90 /* AIO structure(s) */
138#define M_LAST 91 /* Must be last type + 1 */
138
139#define INITKMEMNAMES { \
140 "free", /* 0 M_FREE */ \
141 "mbuf", /* 1 M_MBUF */ \
142 "devbuf", /* 2 M_DEVBUF */ \
143 "socket", /* 3 M_SOCKET */ \
144 "pcb", /* 4 M_PCB */ \
145 "routetbl", /* 5 M_RTABLE */ \

--- 73 unchanged lines hidden (view full) ---

219 "BIO buffer", /* 82 M_BIOBUF */ \
220 "KTRACE", /* 83 M_KTRACE */ \
221 "select", /* 84 M_SELECT */ \
222 "GEOM dev", /* 85 M_GEOM_DEV */ \
223 "GEOM mod", /* 86 M_GEOM_MOD */ \
224 "GEOM req", /* 87 M_GEOM_REQ */ \
225 "GEOM misc", /* 88 M_GEOM_MISC */ \
226 "VFS conf", /* 89 M_VFSCONF */ \
139
140#define INITKMEMNAMES { \
141 "free", /* 0 M_FREE */ \
142 "mbuf", /* 1 M_MBUF */ \
143 "devbuf", /* 2 M_DEVBUF */ \
144 "socket", /* 3 M_SOCKET */ \
145 "pcb", /* 4 M_PCB */ \
146 "routetbl", /* 5 M_RTABLE */ \

--- 73 unchanged lines hidden (view full) ---

220 "BIO buffer", /* 82 M_BIOBUF */ \
221 "KTRACE", /* 83 M_KTRACE */ \
222 "select", /* 84 M_SELECT */ \
223 "GEOM dev", /* 85 M_GEOM_DEV */ \
224 "GEOM mod", /* 86 M_GEOM_MOD */ \
225 "GEOM req", /* 87 M_GEOM_REQ */ \
226 "GEOM misc", /* 88 M_GEOM_MISC */ \
227 "VFS conf", /* 89 M_VFSCONF */ \
228 "AIO", /* 90 M_AIO */ \
227}
228
229struct kmemstats {
230 long ks_inuse; /* # of packets of this type currently in use */
231 long ks_calls; /* total packets of this type ever allocated */
232 long ks_memuse; /* total memory held in bytes */
233 u_short ks_limblocks; /* number of times blocked for hitting limit */
234 u_short ks_mapblocks; /* number of times blocked for kernel map */

--- 128 unchanged lines hidden ---
229}
230
231struct kmemstats {
232 long ks_inuse; /* # of packets of this type currently in use */
233 long ks_calls; /* total packets of this type ever allocated */
234 long ks_memuse; /* total memory held in bytes */
235 u_short ks_limblocks; /* number of times blocked for hitting limit */
236 u_short ks_mapblocks; /* number of times blocked for kernel map */

--- 128 unchanged lines hidden ---