From owner-p4-projects@FreeBSD.ORG Thu Jul 27 08:19:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C7B716A4E2; Thu, 27 Jul 2006 08:19:07 +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 474E016A4DA for ; Thu, 27 Jul 2006 08:19:07 +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 12C1843D53 for ; Thu, 27 Jul 2006 08:19:07 +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 k6R8J6vD043613 for ; Thu, 27 Jul 2006 08:19:06 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6R8J6PR043608 for perforce@freebsd.org; Thu, 27 Jul 2006 08:19:06 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 27 Jul 2006 08:19:06 GMT Message-Id: <200607270819.k6R8J6PR043608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 102534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 08:19:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=102534 Change 102534 by cdjones@cdjones-impulse on 2006/07/27 08:18:58 Fix silly errors in adding the pager process. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#12 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#12 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#12 (text+ko) ==== @@ -149,6 +149,7 @@ struct jail j; struct jail_attach_args jaa; struct proc *j_sched_proc = NULL; + struct proc *j_pager_proc = NULL; int vfslocked, error, tryprid; error = copyin(uap->jail, &j, sizeof(j)); ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#12 (text+ko) ==== @@ -46,6 +46,10 @@ #define J_SCHED_TD_DIE 0x02 #define J_SCHED_TD_DEAD 0x04 +#define J_PAGER_TD_ACTIVE 0x01 +#define J_PAGER_TD_DIE 0x02 +#define J_PAGER_TD_DEAD 0x04 + #ifndef _KERNEL int jail(struct jail *); @@ -98,6 +102,8 @@ unsigned int pr_priority; /* (p) jail priority */ struct proc *pr_scheduler; /* (c) scheduler pid */ int pr_scheduler_flags; /* (p) communication to scheduler */ + struct proc *pr_pager; /* (c) pager pid */ + int pr_pager_flags; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ size_t pr_mem_usage; /* (p) memory in use */ };