Module Name: src
Committed By: bouyer
Date: Sun Mar 25 11:29:59 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern [netbsd-6]: vm.c
src/tests/rump/rumpkern [netbsd-6]: t_vm.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #141):
tests/rump/rumpkern/t_vm.c: revision 1.3
sys/rump/librump/rumpkern/vm.c: revision 1.125
Don't take a mutex we already took 6 lines above.
Starting with Rev. 1.191 of kern/subr_pool.c a pool has to be inactive
for at least 10 seconds before it can be reclaimed.
Change the uvmwait test timeout from 10 to 30 seconds so it has a chance
to reclaim memory and succeed.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.122.2.1 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/tests/rump/rumpkern/t_vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.122 src/sys/rump/librump/rumpkern/vm.c:1.122.2.1
--- src/sys/rump/librump/rumpkern/vm.c:1.122 Sun Jan 29 14:57:31 2012
+++ src/sys/rump/librump/rumpkern/vm.c Sun Mar 25 11:29:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $ */
+/* $NetBSD: vm.c,v 1.122.2.1 2012/03/25 11:29:59 bouyer Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.122.2.1 2012/03/25 11:29:59 bouyer Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1110,7 +1110,6 @@ uvm_pageout(void *arg)
rumpuser_dprintf("pagedaemoness: failed to reclaim "
"memory ... sleeping (deadlock?)\n");
cv_timedwait(&pdaemoncv, &pdaemonmtx, hz);
- mutex_enter(&pdaemonmtx);
}
}
Index: src/tests/rump/rumpkern/t_vm.c
diff -u src/tests/rump/rumpkern/t_vm.c:1.2 src/tests/rump/rumpkern/t_vm.c:1.2.8.1
--- src/tests/rump/rumpkern/t_vm.c:1.2 Mon Jun 14 21:06:09 2010
+++ src/tests/rump/rumpkern/t_vm.c Sun Mar 25 11:29:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vm.c,v 1.2 2010/06/14 21:06:09 pooka Exp $ */
+/* $NetBSD: t_vm.c,v 1.2.8.1 2012/03/25 11:29:59 bouyer Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ ATF_TC_HEAD(uvmwait, tc)
{
atf_tc_set_md_var(tc, "descr", "Tests that uvm_wait works");
- atf_tc_set_md_var(tc, "timeout", "10");
+ atf_tc_set_md_var(tc, "timeout", "30");
}
#define UVMWAIT_LIMIT 1024*1024
