From owner-p4-projects@FreeBSD.ORG Sat May 26 06:06:42 2007 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 E94C416A421; Sat, 26 May 2007 06:06:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88A7916A400 for ; Sat, 26 May 2007 06:06:41 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75B6413C447 for ; Sat, 26 May 2007 06:06:41 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4Q66fNY026577 for ; Sat, 26 May 2007 06:06:41 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4Q66fOk026560 for perforce@freebsd.org; Sat, 26 May 2007 06:06:41 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 26 May 2007 06:06:41 GMT Message-Id: <200705260606.l4Q66fOk026560@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 120417 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: Sat, 26 May 2007 06:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120417 Change 120417 by cdjones@cdjones_iconoclast on 2007/05/26 06:05:42 Fix KASSERT failure (we don't need j_pager_proc anyways), bump jail struct version, and fix jtune usage. Affected files ... .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#3 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#3 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#4 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.c#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -271,7 +271,7 @@ error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); - if (j.version != 0) + if (j.version != 1) return (EINVAL); MALLOC(pr, struct prison *, sizeof(*pr), M_PRISON, M_WAITOK | M_ZERO); @@ -333,8 +333,6 @@ if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) goto e_dropprref; - KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); - pr->pr_pager = j_pager_proc; error = jail_attach(td, &jaa); if (error) @@ -609,6 +607,7 @@ mem_used += vmspace_resident_count(p->p_vmspace); } mem_used *= PAGE_SIZE; + pr->pr_mem_usage = mem_used; return mem_used; } ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#3 (text+ko) ==== @@ -89,7 +89,6 @@ void **pr_slots; /* (p) additional data */ u_int32_t pr_sched_shares; /* (p) jail priority */ u_int pr_estcpu; /* (p) est. cpu of jail */ - struct proc *pr_pager; /* (c) pager pid */ int *pr_pager_flags_ptr; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ size_t pr_mem_usage; /* (p) memory in use */ ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#4 (text+ko) ==== @@ -121,7 +121,7 @@ if (chdir(path) != 0) err(1, "chdir: %s", path); memset(&j, 0, sizeof(j)); - j.version = 0; + j.version = 1; j.path = path; j.hostname = argv[1]; if (inet_aton(argv[2], &in) == 0) ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ usage() { (void)fprintf(stderr, "%s\n", - "usage: jtune -j jid_id [-m mem_limit] [-s cpu_shares]"); + "usage: jtune -j jid_id [-i] [-m mem_limit] [-s cpu_shares]"); exit(0); }