From owner-p4-projects@FreeBSD.ORG  Sat Aug  7 16:53:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8FDAD1065677; Sat,  7 Aug 2010 16:53:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54944106566B
	for <perforce@freebsd.org>; Sat,  7 Aug 2010 16:53:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 41D2A8FC0C
	for <perforce@freebsd.org>; Sat,  7 Aug 2010 16:53:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o77Grpe9027413
	for <perforce@freebsd.org>; Sat, 7 Aug 2010 16:53:51 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o77GrpNq027411
	for perforce@freebsd.org; Sat, 7 Aug 2010 16:53:51 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 7 Aug 2010 16:53:51 GMT
Message-Id: <201008071653.o77GrpNq027411@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182037 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Aug 2010 16:53:51 -0000

http://p4web.freebsd.org/@@182037?ac=10

Change 182037 by trasz@trasz_victim on 2010/08/07 16:53:34

	When containers are enabled, run pagedaemon at least every second
	to recompute RSS.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#25 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#12 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#25 (text+ko) ====

@@ -62,8 +62,6 @@
    container mechanism.  This is a part of HRL, and it's outside the scope
    of the containers project.  This means the code is full of "#ifdef CONTAINERS".
 
- - RSS is accounted for only when pagedaemon is running, i.e. when memory shortage occurs.
-
  - Don't account resources for system processes.  It's not as easy as checking
    for P_SYSTEM flag, as the flag will be set for AIO kernel processes.
 

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#12 (text+ko) ====

@@ -1627,7 +1627,11 @@
 
 	while (TRUE) {
 		mtx_lock(&vm_daemon_mtx);
+#ifdef CONTAINERS
+		msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", hz);
+#else
 		msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", 0);
+#endif
 		swapout_flags = vm_pageout_req_swapout;
 		vm_pageout_req_swapout = 0;
 		mtx_unlock(&vm_daemon_mtx);