From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:50:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF7071065679; Wed, 1 Dec 2010 23:50:30 +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 B2A52106566C for ; Wed, 1 Dec 2010 23:50:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 84AD48FC12 for ; Wed, 1 Dec 2010 23:50:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB1NoUsb054279 for ; Wed, 1 Dec 2010 23:50:30 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB1NoU59054276 for perforce@freebsd.org; Wed, 1 Dec 2010 23:50:30 GMT (envelope-from trasz@freebsd.org) Date: Wed, 1 Dec 2010 23:50:30 GMT Message-Id: <201012012350.oB1NoU59054276@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 186528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 23:50:31 -0000 http://p4web.freebsd.org/@@186528?ac=10 Change 186528 by trasz@trasz_victim on 2010/12/01 23:50:02 Minor tweaks. Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#31 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#38 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#97 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#17 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#31 (text+ko) ==== @@ -79,6 +79,11 @@ - We should have a limit for the number of files that were mmapped and then closed, and remain mapped in memory. + - There are several SysV-related global system limits that are not reflected + in the containers structure - RUSAGE_SHMMNI, for example. This needs + to be investigated; there are many of them and it wouldn't be user-friendly + to add ten new resource counters. + HRL-specific issues: - Bring back per-group limits. ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#38 (text+ko) ==== @@ -104,14 +104,14 @@ case RUSAGE_SBSIZE: case RUSAGE_SWAP: case RUSAGE_NTHR: - case RUSAGE_WALLCLOCK: - case RUSAGE_PCTCPU: case RUSAGE_NMSGQ: case RUSAGE_MSGQQUEUED: case RUSAGE_MSGQSIZE: case RUSAGE_NSEM: case RUSAGE_NSHM: case RUSAGE_SHMSIZE: + case RUSAGE_WALLCLOCK: + case RUSAGE_PCTCPU: return (0); default: return (1); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#97 (text+ko) ==== @@ -102,8 +102,6 @@ { "npts", RUSAGE_NPTS }, { "swap", RUSAGE_SWAP }, { "nthr", RUSAGE_NTHR }, - { "nvnode", RUSAGE_NVNODE }, - { "nsock", RUSAGE_NSOCK }, { "msgqqueued", RUSAGE_MSGQQUEUED }, { "msgqsize", RUSAGE_MSGQSIZE }, { "nmsgq", RUSAGE_NMSGQ }, ==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#17 (text+ko) ==== @@ -67,17 +67,15 @@ #define RUSAGE_NPTS 11 #define RUSAGE_SWAP 12 #define RUSAGE_NTHR 13 -#define RUSAGE_NVNODE 14 -#define RUSAGE_NSOCK 15 -#define RUSAGE_MSGQQUEUED 16 -#define RUSAGE_MSGQSIZE 17 -#define RUSAGE_NMSGQ 18 -#define RUSAGE_NSEM 19 -#define RUSAGE_NSEMOP 20 -#define RUSAGE_NSHM 21 -#define RUSAGE_SHMSIZE 22 -#define RUSAGE_WALLCLOCK 23 -#define RUSAGE_PCTCPU 24 +#define RUSAGE_MSGQQUEUED 14 +#define RUSAGE_MSGQSIZE 15 +#define RUSAGE_NMSGQ 16 +#define RUSAGE_NSEM 17 +#define RUSAGE_NSEMOP 18 +#define RUSAGE_NSHM 19 +#define RUSAGE_SHMSIZE 20 +#define RUSAGE_WALLCLOCK 21 +#define RUSAGE_PCTCPU 22 #define RUSAGE_MAX RUSAGE_PCTCPU /*