From owner-p4-projects@FreeBSD.ORG Tue Jul 7 17:48:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64F2F10656D1; Tue, 7 Jul 2009 17:48:59 +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 16A2C10656C4 for ; Tue, 7 Jul 2009 17:48:59 +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 DD97F8FC2A for ; Tue, 7 Jul 2009 17:48:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n67Hmw8E089019 for ; Tue, 7 Jul 2009 17:48:58 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n67HmwCe089017 for perforce@freebsd.org; Tue, 7 Jul 2009 17:48:58 GMT (envelope-from trasz@freebsd.org) Date: Tue, 7 Jul 2009 17:48:58 GMT Message-Id: <200907071748.n67HmwCe089017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 165762 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: Tue, 07 Jul 2009 17:49:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=165762 Change 165762 by trasz@trasz_victim on 2009/07/07 17:48:09 Add some more debugging stuff, fix a KASSERT. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#26 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#26 (text+ko) ==== @@ -53,6 +53,7 @@ #define HRF_DONT_ACCUMULATE 2 int hrl_group_accounting = 0; + TUNABLE_INT("kern.hrl_group_accounting", &hrl_group_accounting); SYSCTL_INT(_kern, OID_AUTO, hrl_group_accounting, CTLFLAG_RD, &hrl_group_accounting, 0, ""); @@ -199,11 +200,11 @@ */ hrl_allocated_proc(p, HRL_RESOURCE_FILESIZE, 0); hrl_allocated_proc(p, HRL_RESOURCE_COREDUMPSIZE, 0); + hrl_allocated_proc(p, HRL_RESOURCE_PTY, 0); mtx_lock(&hrl_lock); for (i = 0; i < HRL_RESOURCE_MAX; i++) { - if (p->p_usage.hu_resources[i] != 0) - KASSERT(p->p_usage.hu_resources == 0, + KASSERT(p->p_usage.hu_resources[i] == 0, ("dead process still holding resources")); } mtx_unlock(&hrl_lock); @@ -287,6 +288,10 @@ KASSERT(amount > 0, ("hrl_alloc_proc: invalid amount for %s: %lld", hrl_resource_name(resource), amount)); +#if 0 + printf("hrl_alloc_proc: allocating %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); +#endif + mtx_lock(&hrl_lock); p->p_usage.hu_resources[resource] += amount; cred = p->p_ucred; @@ -347,6 +352,10 @@ KASSERT(amount >= 0, ("hrl_allocated_proc: invalid amount for %s: %lld", hrl_resource_name(resource), amount)); +#if 0 + printf("hrl_allocated_proc: allocated %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); +#endif + mtx_lock(&hrl_lock); diff = amount - p->p_usage.hu_resources[resource]; p->p_usage.hu_resources[resource] = amount; @@ -395,14 +404,16 @@ KASSERT(amount > 0, ("hrl_free_proc: invalid amount for %s: %lld", hrl_resource_name(resource), amount)); +#if 0 + printf("hrl_free_proc: freeing %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); +#endif + mtx_lock(&hrl_lock); + KASSERT(amount <= p->p_usage.hu_resources[resource], + ("hrl_free_proc: freeing %lld of %s, which is more than allocated %lld " + "for %s (pid %d)", amount, hrl_resource_name(resource), p->p_usage.hu_resources[resource], + p->p_comm, p->p_pid)); p->p_usage.hu_resources[resource] -= amount; -#ifdef notyet - KASSERT(amount <= p->p_usage.hu_resources[resource], - ("hrl_free_proc: freeing %lld, which is more than allocated %lld " - "for %s", amount, p->p_usage.hu_resources[resource], - hrl_resource_name(resource))); -#endif cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount; if (cred->cr_ruidinfo != cred->cr_uidinfo)