svn commit: r297494 - head/sys/kern

[Edward Tomasz Napierala]

Author: trasz
Date: Fri Apr  1 18:36:10 2016
New Revision: 297494
URL: https://svnweb.freebsd.org/changeset/base/297494

Log:
  Drop the 'resource' argument to racct_decay(); it wouldn't make sense
  to iterate separately for each resource.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/kern_racct.c

Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c	Fri Apr  1 18:29:38 2016	(r297493)
+++ head/sys/kern/kern_racct.c	Fri Apr  1 18:36:10 2016	(r297494)
@@ -1107,23 +1107,21 @@ racct_proc_wakeup(struct proc *p)
 }
 
 static void
-racct_decay_resource(struct racct *racct, void * res, void* dummy)
+racct_decay_callback(struct racct *racct, void *dummy1, void *dummy2)
 {
-	int resource;
 	int64_t r_old, r_new;
 
 	ASSERT_RACCT_ENABLED();
 	mtx_assert(&racct_lock, MA_OWNED);
 
-	resource = *(int *)res;
-	r_old = racct->r_resources[resource];
+	r_old = racct->r_resources[RACCT_PCTCPU];
 
 	/* If there is nothing to decay, just exit. */
 	if (r_old <= 0)
 		return;
 
 	r_new = r_old * RACCT_DECAY_FACTOR / FSCALE;
-	racct->r_resources[resource] = r_new;
+	racct->r_resources[RACCT_PCTCPU] = r_new;
 }
 
 static void
@@ -1141,17 +1139,17 @@ racct_decay_post(void)
 }
 
 static void
-racct_decay(int resource)
+racct_decay()
 {
 
 	ASSERT_RACCT_ENABLED();
 
-	ui_racct_foreach(racct_decay_resource, racct_decay_pre,
-	    racct_decay_post, &resource, NULL);
-	loginclass_racct_foreach(racct_decay_resource, racct_decay_pre,
-	    racct_decay_post, &resource, NULL);
-	prison_racct_foreach(racct_decay_resource, racct_decay_pre,
-	    racct_decay_post, &resource, NULL);
+	ui_racct_foreach(racct_decay_callback, racct_decay_pre,
+	    racct_decay_post, NULL, NULL);
+	loginclass_racct_foreach(racct_decay_callback, racct_decay_pre,
+	    racct_decay_post, NULL, NULL);
+	prison_racct_foreach(racct_decay_callback, racct_decay_pre,
+	    racct_decay_post, NULL, NULL);
 }
 
 static void
@@ -1166,7 +1164,7 @@ racctd(void)
 	ASSERT_RACCT_ENABLED();
 
 	for (;;) {
-		racct_decay(RACCT_PCTCPU);
+		racct_decay();
 
 		sx_slock(&allproc_lock);