Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make uvm_swap_stats acquire swap_syscall_lock by itsself 

so that callers don't need to acquire it beforehand.
- make swap_syscall_lock static.
This commit is contained in:
yamt 2005-09-17 14:51:50 +00:00
parent b0f1e65487
commit b63b4e8324
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/uvm/uvm_swap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.c,v 1.94 2005/06/27 02:29:32 thorpej Exp $ */
/* $NetBSD: uvm_swap.c,v 1.95 2005/09/17 14:51:50 yamt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Matthew R. Green
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.94 2005/06/27 02:29:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.95 2005/09/17 14:51:50 yamt Exp $");
#include "fs_nfs.h"
#include "opt_uvmhist.h"
@ -216,7 +216,7 @@ LIST_HEAD(swap_priority, swappri);
static struct swap_priority swap_priority;
/* locks */
struct lock swap_syscall_lock;
static struct lock swap_syscall_lock;
/*
* prototypes
@ -231,6 +231,8 @@ static void swaplist_trim(void);
static int swap_on(struct proc *, struct swapdev *);
static int swap_off(struct proc *, struct swapdev *);
static void uvm_swap_stats_locked(int, struct swapent *, int, register_t *);
static void sw_reg_strategy(struct swapdev *, struct buf *, int);
static void sw_reg_iodone(struct buf *);
static void sw_reg_start(struct swapdev *);
@ -487,7 +489,7 @@ sys_swapctl(struct lwp *l, void *v, register_t *retval)
len = sizeof(struct swapent) * misc;
sep = (struct swapent *)malloc(len, M_TEMP, M_WAITOK);
uvm_swap_stats(SCARG(uap, cmd), sep, misc, retval);
uvm_swap_stats_locked(SCARG(uap, cmd), sep, misc, retval);
error = copyout(sep, SCARG(uap, arg), len);
free(sep, M_TEMP);
@ -681,6 +683,15 @@ out:
*/
void
uvm_swap_stats(int cmd, struct swapent *sep, int sec, register_t *retval)
{
lockmgr(&swap_syscall_lock, LK_EXCLUSIVE, NULL);
uvm_swap_stats_locked(cmd, sep, sec, retval);
lockmgr(&swap_syscall_lock, LK_RELEASE, NULL);
}
static void
uvm_swap_stats_locked(int cmd, struct swapent *sep, int sec, register_t *retval)
{
struct swappri *spp;
struct swapdev *sdp;

4
sys/uvm/uvm_swap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.h,v 1.12 2005/09/17 14:38:40 yamt Exp $ */
/* $NetBSD: uvm_swap.h,v 1.13 2005/09/17 14:51:50 yamt Exp $ */
/*
* Copyright (c) 1997 Matthew R. Green
@ -48,11 +48,11 @@ int uvm_swap_put(int, struct vm_page **, int, int);
int uvm_swap_alloc(int *, boolean_t);
void uvm_swap_free(int, int);
void uvm_swap_markbad(int, int);
void uvm_swap_stats(int, struct swapent *, int, register_t *);
boolean_t uvm_swapisfull(void);
#else /* defined(VMSWAP) */
#define uvm_swapisfull() TRUE
#endif /* defined(VMSWAP) */
void uvm_swap_stats(int, struct swapent *, int, register_t *);
#endif /* _KERNEL */