socsvn commit: r237945 - in soc2012/rudot/sys: kern sys
rudot at FreeBSD.org
rudot at FreeBSD.org
Tue Jun 19 09:26:07 UTC 2012
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_ */
More information about the svn-soc-all
mailing list