From owner-p4-projects@FreeBSD.ORG  Mon Aug 10 17:59:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC3801065674; Mon, 10 Aug 2009 17:59:07 +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 6C33D106564A
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 17:59:07 +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 5AF9D8FC35
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 17:59:07 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7AHx7TF068971
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 17:59:07 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7AHx7HG068969
	for perforce@freebsd.org; Mon, 10 Aug 2009 17:59:07 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 10 Aug 2009 17:59:07 GMT
Message-Id: <200908101759.n7AHx7HG068969@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 167181 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, 10 Aug 2009 17:59:08 -0000

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

Change 167181 by trasz@trasz_anger on 2009/08/10 17:59:04

	Make 'sig*' actions work.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#52 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#10 (text+ko) ====

@@ -17,6 +17,10 @@
 
  - Some things need to be accounted for per-euid, and some per-egid.  Geez.
 
+ - In maxproc limit, make sure the 'p' argument is a child process.  Otherwise,
+   if one adds rule with 'sig*' action, the signal will be sent to the parent
+   instead of the child.
+
  - Add sorting to hrl(8).
 
  - Use expand_number(3) in hrl(8).

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

@@ -233,10 +233,19 @@
 static void
 hrl_deferred_psignal(struct proc *p, int signum)
 {
+	int need_lock;
+
+	/*
+	 * XXX: This is ugly.  Either turn it into a real taskqueue,
+	 *      or think about the locking and don't lock proc here.
+	 */
+	need_lock = !PROC_LOCKED(p);
 
-	PROC_LOCK(p);
+	if (need_lock)
+		PROC_LOCK(p);
 	psignal(p, signum);
-	PROC_UNLOCK(p);
+	if (need_lock)
+		PROC_UNLOCK(p);
 }
 
 /*