From owner-svn-soc-all@FreeBSD.ORG Tue Jun 19 09:26:07 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 9DD35106566C for ; Tue, 19 Jun 2012 09:26:05 +0000 (UTC) (envelope-from rudot@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 19 Jun 2012 09:26:05 +0000 Date: Tue, 19 Jun 2012 09:26:05 +0000 From: rudot@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120619092605.9DD35106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r237945 - in soc2012/rudot/sys: kern sys X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2012 09:26:07 -0000 Author: rudot Date: Tue Jun 19 09:26:04 2012 New Revision: 237945 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237945 Log: moving some defs Modified: soc2012/rudot/sys/kern/kern_racct.c soc2012/rudot/sys/kern/sched_4bsd.c soc2012/rudot/sys/sys/rctl.h soc2012/rudot/sys/sys/sched.h Modified: soc2012/rudot/sys/kern/kern_racct.c ============================================================================== --- soc2012/rudot/sys/kern/kern_racct.c Tue Jun 19 08:12:44 2012 (r237944) +++ soc2012/rudot/sys/kern/kern_racct.c Tue Jun 19 09:26:04 2012 (r237945) @@ -63,9 +63,6 @@ #ifdef RACCT -#define TDF_RACCT_PCTCPU TDF_SCHED2 -#define TDF_RACCT_RQ TDF_SCHED3 - FEATURE(racct, "Resource Accounting"); static struct mtx racct_lock; @@ -513,7 +510,7 @@ /* * This is basicly racct_set_force_locked(), but with the added * benefit that if we are over limits, we let the caller know - * via the return value. But we stil do set the resource to the + * via the return value. But we still do set the resource to the * specified amount. */ static int Modified: soc2012/rudot/sys/kern/sched_4bsd.c ============================================================================== --- soc2012/rudot/sys/kern/sched_4bsd.c Tue Jun 19 08:12:44 2012 (r237944) +++ soc2012/rudot/sys/kern/sched_4bsd.c Tue Jun 19 09:26:04 2012 (r237945) @@ -107,10 +107,6 @@ /* flags kept in td_flags */ #define TDF_DIDRUN TDF_SCHED0 /* thread actually ran. */ #define TDF_BOUND TDF_SCHED1 /* Bound to one CPU. */ -#ifdef RACCT -#define TDF_RACCT_PCTCPU TDF_SCHED2 -#define TDF_RACCT_RQ TDF_SCHED3 -#endif /* flags kept in ts_flags */ #define TSF_AFFINITY 0x0001 /* Has a non-"full" CPU set. */ Modified: soc2012/rudot/sys/sys/rctl.h ============================================================================== --- soc2012/rudot/sys/sys/rctl.h Tue Jun 19 08:12:44 2012 (r237944) +++ soc2012/rudot/sys/sys/rctl.h Tue Jun 19 09:26:04 2012 (r237945) @@ -139,7 +139,7 @@ void rctl_rule_release(struct rctl_rule *rule); int rctl_rule_add(struct rctl_rule *rule); int rctl_rule_remove(struct rctl_rule *filter); -int rctl_enforce(struct proc *p, int resource, uint64_t amount); +int rctl_enforce(struct proc *p, int resource, int64_t amount); uint64_t rctl_get_limit(struct proc *p, int resource); uint64_t rctl_get_available(struct proc *p, int resource); const char *rctl_resource_name(int resource); Modified: soc2012/rudot/sys/sys/sched.h ============================================================================== --- soc2012/rudot/sys/sys/sched.h Tue Jun 19 08:12:44 2012 (r237944) +++ soc2012/rudot/sys/sys/sched.h Tue Jun 19 09:26:04 2012 (r237945) @@ -237,4 +237,10 @@ __END_DECLS #endif + +#ifdef RACCT +#define TDF_RACCT_PCTCPU TDF_SCHED2 +#define TDF_RACCT_RQ TDF_SCHED3 +#endif + #endif /* !_SCHED_H_ */