From owner-p4-projects@FreeBSD.ORG  Sun Feb 13 17:07:32 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 201811065697; Sun, 13 Feb 2011 17:07:32 +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 D48C31065694
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 17:07:31 +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 BE65B8FC17
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 17:07:31 +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 p1DH7V7k001653
	for <perforce@freebsd.org>; Sun, 13 Feb 2011 17:07:31 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1DH7Vmf001650
	for perforce@freebsd.org; Sun, 13 Feb 2011 17:07:31 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 13 Feb 2011 17:07:31 GMT
Message-Id: <201102131707.p1DH7Vmf001650@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 188787 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 13 Feb 2011 17:07:32 -0000

http://p4web.freebsd.org/@@188787?ac=10

Change 188787 by trasz@trasz_victim on 2011/02/13 17:06:50

	If warning couldn't be logged due to ppsratecheck(), don't mark link
	as exceeded; this way we might log a warning later.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#31 edit

Differences ...

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

@@ -280,7 +280,7 @@
 	struct rctl_rule *rule;
 	struct rctl_rule_link *link;
 	struct sbuf sb;
-	int should_deny = 0, already_exceeded;
+	int should_deny = 0;
 	char *buf;
 	static int curtime = 0;
 	static struct timeval lasttime;
@@ -300,15 +300,16 @@
 			continue;
 		}
 
-		already_exceeded = link->rrl_exceeded;
-		link->rrl_exceeded = 1;
-
 		switch (rule->rr_action) {
 		case RCTL_ACTION_DENY:
 			should_deny = 1;
 			continue;
 		case RCTL_ACTION_LOG:
-			if (already_exceeded)
+			/*
+			 * If rrl_exceeded != 0, it means we've already
+			 * logged a warning for this process.
+			 */
+			if (link->rrl_exceeded != 0)
 				continue;
 
 			if (!ppsratecheck(&lasttime, &curtime, 10))
@@ -328,9 +329,10 @@
 			    p->p_ucred->cr_prison->pr_id);
 			sbuf_delete(&sb);
 			free(buf, M_RCTL);
+			link->rrl_exceeded = 1;
 			continue;
 		default:
-			if (already_exceeded)
+			if (link->rrl_exceeded != 0)
 				continue;
 
 			KASSERT(rule->rr_action > 0 &&
@@ -343,6 +345,7 @@
 			 * are equal to their counterparts from sys/signal.h.
 			 */
 			psignal(p, rule->rr_action);
+			link->rrl_exceeded = 1;
 			continue;
 		}
 	}