From owner-p4-projects@FreeBSD.ORG  Mon Jul  6 16:41:19 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2EE061065672; Mon,  6 Jul 2009 16:41:19 +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 E2FE4106566C
	for <perforce@freebsd.org>; Mon,  6 Jul 2009 16:41:18 +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 B7BDC8FC1D
	for <perforce@freebsd.org>; Mon,  6 Jul 2009 16:41:18 +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 n66GfI3t077947
	for <perforce@freebsd.org>; Mon, 6 Jul 2009 16:41:18 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n66GfIaC077945
	for perforce@freebsd.org; Mon, 6 Jul 2009 16:41:18 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 6 Jul 2009 16:41:18 GMT
Message-Id: <200907061641.n66GfIaC077945@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165707 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, 06 Jul 2009 16:41:20 -0000

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

Change 165707 by trasz@trasz_victim on 2009/07/06 16:40:29

	Clean up maxprocesses accounting.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#7 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#7 (text+ko) ====

@@ -224,6 +224,10 @@
 
 	p1 = td->td_proc;
 
+	error = hrl_alloc_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
+	if (error)
+		return (error);
+
 	/*
 	 * Here we don't create a new process, but we divorce
 	 * certain parts of a process from itself.
@@ -234,6 +238,7 @@
 			PROC_LOCK(p1);
 			if (thread_single(SINGLE_BOUNDARY)) {
 				PROC_UNLOCK(p1);
+				hrl_free_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
 				return (ERESTART);
 			}
 			PROC_UNLOCK(p1);
@@ -267,6 +272,8 @@
 			PROC_UNLOCK(p1);
 		}
 		*procp = NULL;
+		if (error)
+			hrl_free_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
 		return (error);
 	}
 
@@ -346,18 +353,14 @@
 	 * XXXRW: Can we avoid privilege here if it's not needed?
 	 */
 	error = priv_check_cred(td->td_ucred, PRIV_PROC_LIMIT, 0);
-	if (error == 0) {
+	if (error == 0)
 		ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1, 0);
-		error = hrl_alloc_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
-	} else {
+	else {
 		PROC_LOCK(p1);
 		ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1,
 		    lim_cur(p1, RLIMIT_NPROC));
-		error = hrl_alloc_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
 		PROC_UNLOCK(p1);
 	}
-	if (ok != !error)
-		printf("fork1: ok = %d, error = %d\n", ok, error);
 	if (!ok) {
 		error = EAGAIN;
 		goto fail;
@@ -584,12 +587,6 @@
 	PROC_UNLOCK(p1);
 	PROC_UNLOCK(p2);
 
-	/*
-	 * Initialize HRL accounting information.
-	 * XXX: Handle failure?
-	 */
-	hrl_proc_fork(p1, p2);
-
 	/* Bump references to the text vnode (for procfs) */
 	if (p2->p_textvp)
 		vref(p2->p_textvp);
@@ -808,6 +805,7 @@
 		vmspace_free(vm2);
 	uma_zfree(proc_zone, newproc);
 	pause("fork", hz / 2);
+	hrl_free_proc(p1, HRL_RESOURCE_MAXPROCESSES, 1);
 	return (error);
 }