summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-02-18 06:40:07 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-02-18 06:40:07 +0100
commitb0fa32c1d7de74a8b83b33833640ff30c84e9fbd (patch)
tree7e8cc66618bdfdcb230c7cbb10764d9cf1274f5c
parentaabd2b8ef9b1caa4c1f4339adeebef62b34f7a01 (diff)
kern: avoid #if 0ing out thread_collect_scan
Currently, `thread_collect_scan' does nothing because `pcb_collect' is a nop. Its body is exempt from compilation by means of the preprocessor. This is unfortunate as it increases the risk of bitrot, and we still need to pay the price of rate-limiting thread_collect_scan. * kern/thread.c (thread_collect_scan): Drop #if 0 around the body. * vm/vm_pageout.c (vm_pageout_scan): Do not call `consider_thread_collect' and document why.
-rw-r--r--kern/thread.c2
-rw-r--r--vm/vm_pageout.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kern/thread.c b/kern/thread.c
index 8474950..c627a06 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -2236,7 +2236,6 @@ thread_wire(
void thread_collect_scan(void)
{
-#if 0
register thread_t thread, prev_thread;
processor_set_t pset, prev_pset;
@@ -2289,7 +2288,6 @@ void thread_collect_scan(void)
thread_deallocate(prev_thread);
if (prev_pset != PROCESSOR_SET_NULL)
pset_deallocate(prev_pset);
-#endif /* 0 */
}
boolean_t thread_collect_allowed = TRUE;
diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
index ecedb57..aff823a 100644
--- a/vm/vm_pageout.c
+++ b/vm/vm_pageout.c
@@ -551,6 +551,8 @@ void vm_pageout_scan(void)
stack_collect();
net_kmsg_collect();
consider_task_collect();
+ if (0) /* XXX: pcb_collect doesn't do anything yet, so it is
+ pointless to call consider_thread_collect. */
consider_thread_collect();
slab_collect();