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

Pass the caller's file name and line number to the vm_map locking functions.

Browse Source
This commit is contained in:
Alan Cox 2002-04-28 23:12:52 +00:00
parent 21ed9908a2
commit 780b1c0997
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/vm/vm_map.c
View File

@ -370,7 +370,7 @@ vm_map_entry_set_behavior(struct vm_map_entry *entry, u_char behavior)
}
void
vm_map_lock(vm_map_t map)
_vm_map_lock(vm_map_t map, const char *file, int line)
{
vm_map_printf("locking map LK_EXCLUSIVE: %p\n", map);
if (lockmgr(&map->lock, LK_EXCLUSIVE, NULL, curthread) != 0)
@ -379,28 +379,28 @@ vm_map_lock(vm_map_t map)
}
void
vm_map_unlock(vm_map_t map)
_vm_map_unlock(vm_map_t map, const char *file, int line)
{
vm_map_printf("locking map LK_RELEASE: %p\n", map);
lockmgr(&(map)->lock, LK_RELEASE, NULL, curthread);
}
void
vm_map_lock_read(vm_map_t map)
_vm_map_lock_read(vm_map_t map, const char *file, int line)
{
vm_map_printf("locking map LK_SHARED: %p\n", map);
lockmgr(&(map)->lock, LK_SHARED, NULL, curthread);
}
void
vm_map_unlock_read(vm_map_t map)
_vm_map_unlock_read(vm_map_t map, const char *file, int line)
{
vm_map_printf("locking map LK_RELEASE: %p\n", map);
lockmgr(&(map)->lock, LK_RELEASE, NULL, curthread);
}
int
vm_map_trylock(vm_map_t map)
_vm_map_trylock(vm_map_t map, const char *file, int line)
{
return (lockmgr(&map->lock, LK_EXCLUSIVE | LK_NOWAIT, NULL,
@ -408,7 +408,7 @@ vm_map_trylock(vm_map_t map)
}
static __inline__ int
_vm_map_lock_upgrade(vm_map_t map, struct thread *td) {
__vm_map_lock_upgrade(vm_map_t map, struct thread *td) {
int error;
vm_map_printf("locking map LK_EXCLUPGRADE: %p\n", map);
@ -419,20 +419,20 @@ _vm_map_lock_upgrade(vm_map_t map, struct thread *td) {
}
int
vm_map_lock_upgrade(vm_map_t map)
_vm_map_lock_upgrade(vm_map_t map, const char *file, int line)
{
return (_vm_map_lock_upgrade(map, curthread));
return (__vm_map_lock_upgrade(map, curthread));
}
void
vm_map_lock_downgrade(vm_map_t map)
_vm_map_lock_downgrade(vm_map_t map, const char *file, int line)
{
vm_map_printf("locking map LK_DOWNGRADE: %p\n", map);
lockmgr(&map->lock, LK_DOWNGRADE, NULL, curthread);
}
void
vm_map_set_recursive(vm_map_t map)
_vm_map_set_recursive(vm_map_t map, const char *file, int line)
{
mtx_lock((map)->lock.lk_interlock);
map->lock.lk_flags |= LK_CANRECURSE;
@ -440,7 +440,7 @@ vm_map_set_recursive(vm_map_t map)
}
void
vm_map_clear_recursive(vm_map_t map)
_vm_map_clear_recursive(vm_map_t map, const char *file, int line)
{
mtx_lock((map)->lock.lk_interlock);
map->lock.lk_flags &= ~LK_CANRECURSE;

33
sys/vm/vm_map.h
View File

@ -70,6 +70,7 @@
#ifndef _VM_MAP_
#define _VM_MAP_
#include <sys/lock.h>
#include <sys/lockmgr.h>
#ifdef MAP_LOCK_DIAGNOSTIC
@ -237,15 +238,29 @@ void vm_map_entry_set_behavior(struct vm_map_entry *entry, u_char behavior);
} while (0)
#endif
void vm_map_lock(vm_map_t map);
void vm_map_unlock(vm_map_t map);
void vm_map_lock_read(vm_map_t map);
void vm_map_unlock_read(vm_map_t map);
int vm_map_trylock(vm_map_t map);
int vm_map_lock_upgrade(vm_map_t map);
void vm_map_lock_downgrade(vm_map_t map);
void vm_map_set_recursive(vm_map_t map);
void vm_map_clear_recursive(vm_map_t map);
void _vm_map_lock(vm_map_t map, const char *file, int line);
void _vm_map_unlock(vm_map_t map, const char *file, int line);
void _vm_map_lock_read(vm_map_t map, const char *file, int line);
void _vm_map_unlock_read(vm_map_t map, const char *file, int line);
int _vm_map_trylock(vm_map_t map, const char *file, int line);
int _vm_map_lock_upgrade(vm_map_t map, const char *file, int line);
void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line);
void _vm_map_set_recursive(vm_map_t map, const char *file, int line);
void _vm_map_clear_recursive(vm_map_t map, const char *file, int line);
#define vm_map_lock(map) _vm_map_lock(map, LOCK_FILE, LOCK_LINE)
#define vm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE, LOCK_LINE)
#define vm_map_lock_read(map) _vm_map_lock_read(map, LOCK_FILE, LOCK_LINE)
#define vm_map_unlock_read(map) _vm_map_unlock_read(map, LOCK_FILE, LOCK_LINE)
#define vm_map_trylock(map) _vm_map_trylock(map, LOCK_FILE, LOCK_LINE)
#define vm_map_lock_upgrade(map) \
_vm_map_lock_upgrade(map, LOCK_FILE, LOCK_LINE)
#define vm_map_lock_downgrade(map) \
_vm_map_lock_downgrade(map, LOCK_FILE, LOCK_LINE)
#define vm_map_set_recursive(map) \
_vm_map_set_recursive(map, LOCK_FILE, LOCK_LINE)
#define vm_map_clear_recursive(map) \
_vm_map_clear_recursive(map, LOCK_FILE, LOCK_LINE)
struct pmap *vmspace_pmap(struct vmspace *vmspace);
long vmspace_resident_count(struct vmspace *vmspace);