From owner-p4-projects@FreeBSD.ORG  Fri Jan 14 20:20:01 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B8A4C1065693; Fri, 14 Jan 2011 20:20:01 +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 7AE351065670
	for <perforce@freebsd.org>; Fri, 14 Jan 2011 20:20:01 +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 45D0D8FC0C
	for <perforce@freebsd.org>; Fri, 14 Jan 2011 20:20:01 +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 p0EKK1Tw012229
	for <perforce@freebsd.org>; Fri, 14 Jan 2011 20:20:01 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0EKK1V1012226
	for perforce@freebsd.org; Fri, 14 Jan 2011 20:20:01 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 14 Jan 2011 20:20:01 GMT
Message-Id: <201101142020.p0EKK1V1012226@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 187812 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: Fri, 14 Jan 2011 20:20:02 -0000

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

Change 187812 by trasz@trasz_victim on 2011/01/14 20:19:22

	Make the code less confusing.

Affected files ...

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

Differences ...

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

@@ -77,7 +77,7 @@
  */
 struct rctl_rule_link {
 	LIST_ENTRY(rctl_rule_link)	rctl_next;
-	struct rctl_rule			*rctl_rule;
+	struct rctl_rule		*rctl_rule;
 };
 
 struct dict {
@@ -141,7 +141,7 @@
 static int rctl_rule_fully_specified(const struct rctl_rule *rule);
 static void rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule);
 
-MALLOC_DEFINE(M_RCTL, "rctl", "Hierarchical Resource Limits");
+MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits");
 
 static const char *
 rctl_subject_type_name(int subject)
@@ -302,10 +302,10 @@
 		switch (rule->hr_action) {
 		case RCTL_ACTION_DENY:
 			should_deny = 1;
-			break;
+			continue;
 		case RCTL_ACTION_LOG:
 			if (!ppsratecheck(&lasttime, &curtime, 10))
-				break;
+				continue;
 
 			buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT);
 			if (buf == NULL) {
@@ -320,25 +320,25 @@
 			    p->p_comm, p->p_ucred->cr_uid);
 			sbuf_delete(&sb);
 			free(buf, M_RCTL);
-			break;
+			continue;
 		case RCTL_ACTION_SIGHUP:
 			rctl_deferred_psignal(p, SIGHUP);
-			break;
+			continue;
 		case RCTL_ACTION_SIGINT:
 			rctl_deferred_psignal(p, SIGINT);
-			break;
+			continue;
 		case RCTL_ACTION_SIGKILL:
 			rctl_deferred_psignal(p, SIGKILL);
-			break;
+			continue;
 		case RCTL_ACTION_SIGSEGV:
 			rctl_deferred_psignal(p, SIGSEGV);
-			break;
+			continue;
 		case RCTL_ACTION_SIGXCPU:
 			rctl_deferred_psignal(p, SIGXCPU);
-			break;
+			continue;
 		case RCTL_ACTION_SIGXFSZ:
 			rctl_deferred_psignal(p, SIGXFSZ);
-			break;
+			continue;
 		default:
 			panic("rctl_enforce_proc: unknown action %d",
 			    rule->hr_action);