d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "struct kmemstats" to "struct malloc_type" it makes more sense now.

Browse Source 
Fix type argument to hashinit() and phashinit()
This commit is contained in:
Poul-Henning Kamp 1997-10-10 18:14:23 +00:00
parent 631821df68
commit 60a513e942
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=30281
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/kern/kern_malloc.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94
* $Id: kern_malloc.c,v 1.30 1997/09/16 13:51:58 bde Exp $
* $Id: kern_malloc.c,v 1.31 1997/10/10 14:06:34 phk Exp $
*/
#include <sys/param.h>
@ -51,10 +51,10 @@
#include <vm/vm_map.h>
static void kmeminit __P((void *));
static void malloc_init __P((struct kmemstats *));
static void malloc_init __P((struct malloc_type *));
SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL)
struct kmemstats *kmemstatistics = M_FREE;
struct malloc_type *kmemstatistics = M_FREE;
static struct kmembuckets bucket[MINBUCKET + 16];
static struct kmemusage *kmemusage;
static char *kmembase;
@ -86,7 +86,7 @@ static long addrmask[] = { 0,
*/
struct freelist {
long spare0;
struct kmemstats *type;
struct malloc_type *type;
long spare1;
caddr_t next;
};
@ -102,7 +102,7 @@ struct freelist {
void *
malloc(size, type, flags)
unsigned long size;
struct kmemstats *type;
struct malloc_type *type;
int flags;
{
register struct kmembuckets *kbp;
@ -116,7 +116,7 @@ malloc(size, type, flags)
int copysize;
char *savedtype;
#endif
register struct kmemstats *ksp = type;
register struct malloc_type *ksp = type;
if (!type->ks_next)
malloc_init(type);
@ -195,10 +195,10 @@ malloc(size, type, flags)
freep = (struct freelist *)va;
savedtype = type->ks_shortdesc;
#if BYTE_ORDER == BIG_ENDIAN
freep->type = (struct kmemstats *)WEIRD_ADDR >> 16;
freep->type = (struct malloc_type *)WEIRD_ADDR >> 16;
#endif
#if BYTE_ORDER == LITTLE_ENDIAN
freep->type = (struct kmemstats *)WEIRD_ADDR;
freep->type = (struct malloc_type *)WEIRD_ADDR;
#endif
if (((long)(&freep->next)) & 0x2)
freep->next = (caddr_t)((WEIRD_ADDR >> 16)|(WEIRD_ADDR << 16));
@ -239,7 +239,7 @@ malloc(size, type, flags)
void
free(addr, type)
void *addr;
struct kmemstats *type;
struct malloc_type *type;
{
register struct kmembuckets *kbp;
register struct kmemusage *kup;
@ -250,7 +250,7 @@ free(addr, type)
struct freelist *fp;
long *end, *lp, alloc, copysize;
#endif
register struct kmemstats *ksp = type;
register struct malloc_type *ksp = type;
if (!type->ks_next)
malloc_init(type);
@ -399,7 +399,7 @@ kmeminit(dummy)
static void
malloc_init(type)
struct kmemstats *type;
struct malloc_type *type;
{
int npg;

8
sys/kern/kern_subr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_subr.c 8.3 (Berkeley) 1/21/94
* $Id: kern_subr.c,v 1.11 1997/05/28 00:47:27 alex Exp $
* $Id: kern_subr.c,v 1.12 1997/09/02 20:05:42 bde Exp $
*/
#include <sys/param.h>
@ -198,7 +198,8 @@ uwritec(uio)
*/
void *
hashinit(elements, type, hashmask)
int elements, type;
int elements;
struct malloc_type *type;
u_long *hashmask;
{
long hashsize;
@ -227,7 +228,8 @@ static int primes[] = { 1, 13, 31, 61, 127, 251, 509, 761, 1021, 1531, 2039,
*/
void *
phashinit(elements, type, nentries)
int elements, type;
int elements;
struct malloc_type *type;
u_long *nentries;
{
long hashsize;