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

expand_table: Add parameters file and line if we're debugging.

Browse Source 
MMalloc, vinum_meminfo: Use strlcpy to copy file name.

Approved by: re (jhb)
This commit is contained in:
grog 2003-05-23 01:15:01 +00:00
parent 23a0f80a76
commit 25103020fb
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/vinum/vinummemory.c
View File

@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
* $Id: vinummemory.c,v 1.30 2003/04/28 02:54:43 grog Exp $
* $Id: vinummemory.c,v 1.31 2003/05/23 01:08:36 grog Exp $
* $FreeBSD$
*/
@ -104,27 +104,40 @@ basename(char *file)
return ++f; /* skip the / */
}
#ifdef VINUMDEBUG
void
expand_table(void **table, int oldsize, int newsize, char *file, int line)
#else
void
expand_table(void **table, int oldsize, int newsize)
#endif
{
if (newsize > oldsize) {
int *temp;
int s;
s = splhigh();
#ifdef VINUMDEBUG
temp = (int *) MMalloc(newsize, file, line); /* allocate a new table */
#else
temp = (int *) Malloc(newsize); /* allocate a new table */
#endif
CHECKALLOC(temp, "vinum: Can't expand table\n");
bzero((char *) temp, newsize); /* clean it all out */
if (*table != NULL) { /* already something there, */
bcopy((char *) *table, (char *) temp, oldsize); /* copy it to the old table */
#ifdef VINUMDEBUG
FFree(*table, file, line);
#else
Free(*table);
#endif
}
*table = temp;
splx(s);
}
}
#ifdef VINUMDEBUG /* XXX debug */
#ifdef VINUMDEBUG
#define MALLOCENTRIES 16384
int malloccount = 0;
int highwater = 0; /* highest index ever allocated */
@ -172,8 +185,7 @@ MMalloc(int size, char *file, int line)
malloced[i].size = size;
malloced[i].line = line;
malloced[i].address = result;
bcopy(f, malloced[i].file, min(strlen(f), MCFILENAMELEN - 1));
malloced[i].file[MCFILENAMELEN - 1] = '\0';
strlcpy(malloced[i].file, f, MCFILENAMELEN);
}
if (malloccount > highwater)
highwater = malloccount;
@ -208,8 +220,7 @@ FFree(void *mem, char *file, int line)
freeinfo[lastfree].size = malloced[i].size;
freeinfo[lastfree].line = line;
freeinfo[lastfree].address = mem;
bcopy(f, freeinfo[lastfree].file, min(strlen(f), MCFILENAMELEN - 1));
freeinfo[lastfree].file[MCFILENAMELEN - 1] = '\0';
bcopy(f, freeinfo[lastfree].file, MCFILENAMELEN);
if (++lastfree == FREECOUNT)
lastfree = 0;
}
@ -251,7 +262,7 @@ vinum_mallocinfo(caddr_t data)
m->size = malloced[ent].size;
m->line = malloced[ent].line;
m->seq = malloced[ent].seq;
bcopy(malloced[ent].file, m->file, MCFILENAMELEN);
strlcpy(m->file, malloced[ent].file, MCFILENAMELEN);
return 0;
}