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

When INVARIANTS is on and we're in uma_zalloc_free(), we need to make

Browse Source 
sure that uma_dbg_free() is called if we're about to call
uma_zfree_internal() but we're asking it to skip the dtor and
uma_dbg_free() call itself.  So, if we're about to call
uma_zfree_internal() from uma_zfree_arg() and skip == 1, call
uma_dbg_free() ourselves.
This commit is contained in:
Bosko Milekic 2003-08-02 22:40:27 +00:00
parent 3664d35cd5
commit 48bf87258f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/vm/uma_core.c
View File

@ -1811,6 +1811,21 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
zfree_internal:
#ifdef INVARIANTS
/*
* If we need to skip the dtor and the uma_dbg_free in uma_zfree_internal
* because we've already called the dtor above, but we ended up here, then
* we need to make sure that we take care of the uma_dbg_free immediately.
*/
if (skip) {
ZONE_LOCK(zone);
if (zone->uz_flags & UMA_ZFLAG_MALLOC)
uma_dbg_free(zone, udata, item);
else
uma_dbg_free(zone, NULL, item);
ZONE_UNLOCK(zone);
}
#endif
uma_zfree_internal(zone, item, udata, skip);
return;