From owner-p4-projects@FreeBSD.ORG  Mon Aug 21 08:45:27 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 487DC16A4DE; Mon, 21 Aug 2006 08:45:27 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0062916A4DA
	for <perforce@FreeBSD.org>; Mon, 21 Aug 2006 08:45:26 +0000 (UTC)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C2E6D43D4C
	for <perforce@FreeBSD.org>; Mon, 21 Aug 2006 08:45:26 +0000 (GMT)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7L8jQkk044416
	for <perforce@FreeBSD.org>; Mon, 21 Aug 2006 08:45:26 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7L8jQZs044413
	for perforce@freebsd.org; Mon, 21 Aug 2006 08:45:26 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Mon, 21 Aug 2006 08:45:26 GMT
Message-Id: <200608210845.k7L8jQZs044413@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cdjones@FreeBSD.org using -f
From: Chris Jones <cdjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 104665 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 21 Aug 2006 08:45:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=104665

Change 104665 by cdjones@cdjones-impulse on 2006/08/21 08:44:56

	Get rid of more debugging output.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#25 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#25 (text+ko) ====

@@ -173,13 +173,7 @@
 			 *
 			 */
 			
-			printf("jpager/%d: memory %ld / %ld bytes\n", 
-			       pr_id, usage, limit);
-			
 			if ((usage - limit) > 0) {
-				printf("jpager/%d: overcommitted by %ld bytes (%f percent)\n",
-				       pr_id, usage - limit,
-				       (double) 100 * ((double) (usage - limit) / (double) limit)); 
 				sx_slock(&allproc_lock);
 				LIST_FOREACH(p, &allproc, p_list) {
 					
@@ -228,17 +222,11 @@
 					if (cursize < 0)
 						newsize = 0;
 					PROC_UNLOCK(p);
-					printf("jpager/%d: squeezing process %d from %ld to %ld\n", 
-					       pr_id, p->p_pid, cursize, newsize);
 					vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, newsize);
-					printf("jpager/%d: squeezed process %d from %ld to %ld (wanted %ld)\n",
-					       pr_id, p->p_pid, cursize, 
-					       vmspace_resident_count(p->p_vmspace), newsize);
 				} /* end LIST_FOREACH procs */
 				sx_sunlock(&allproc_lock);
 			}
 		}
-
 		tsleep(pr, 0, "-", jail_memory_pager_interval * hz); 
 	}
 	
@@ -329,7 +317,10 @@
 	td->td_retval[0] = jaa.jid;
 	return (0);
 e_dropprref:
-	/* TODO: kill pager, scheduler if they've started. */
+	if (j_pager_proc != NULL) {
+		*pr->pr_pager_flags_ptr = J_PAGER_TD_DIE;
+		wakeup(pr);
+	}
 	mtx_lock(&allprison_mtx);
 	LIST_REMOVE(pr, pr_list);
 	prisoncount--;