From 6a7c9d88e361adfc49eb0116b3a52fe76619cb9c Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Tue, 19 Oct 2004 22:55:10 +0000 Subject: [PATCH] disabled code for CKRM memory class shrinking --- kernel/ckrm/ckrm_mem.c | 4 ++++ mm/vmscan.c | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kernel/ckrm/ckrm_mem.c b/kernel/ckrm/ckrm_mem.c index 4d38cda49..20a7ea68e 100644 --- a/kernel/ckrm/ckrm_mem.c +++ b/kernel/ckrm/ckrm_mem.c @@ -583,6 +583,9 @@ ckrm_get_reclaim_bits(unsigned int *flags, unsigned int *extract) void ckrm_at_limit(ckrm_mem_res_t *cls) { +#ifndef AT_LIMIT_SUPPORT +#warning "ckrm_at_limit disabled due to problems with memory hog tests" +#else struct zone *zone; unsigned long now = jiffies; @@ -606,6 +609,7 @@ ckrm_at_limit(ckrm_mem_res_t *cls) wakeup_kswapd(zone); break; // only once is enough } +#endif // AT_LIMIT_SUPPORT } static int unmapped = 0, changed = 0, unchanged = 0, maxnull = 0, diff --git a/mm/vmscan.c b/mm/vmscan.c index fa5a5e795..e01d5c98d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -39,6 +39,12 @@ #include #include +#ifndef AT_LIMIT_SUPPORT +#warning "ckrm_at_limit disabled due to problems with memory hog tests -- seting ckrm_shrink_list_empty to true" +#undef ckrm_shrink_list_empty +#define ckrm_shrink_list_empty() (1) +#endif + /* possible outcome of pageout() */ typedef enum { /* failed to write page out, page is locked */ @@ -719,8 +725,8 @@ redo: list_add(&page->lru, &l_hold); ckrm_mem_dec_active(page); pgmoved++; - pgscanned++; - } + pgscanned++; + } if (!--nr_pass && ckrm_flags) { goto redo; } @@ -895,7 +901,7 @@ shrink_zone(struct zone *zone, struct scan_control *sc) } } -#ifdef CONFIG_CKRM_RES_MEM +#if defined(CONFIG_CKRM_RES_MEM) && defined(AT_LIMIT_SUPPORT) // This function needs to be given more thought. // Shrink the class to be at 90% of its limit static void @@ -995,6 +1001,11 @@ ckrm_shrink_classes(void) } #else + +#if defined(CONFIG_CKRM_RES_MEM) && !defined(AT_LIMIT_SUPPORT) +#warning "disabling ckrm_at_limit -- setting ckrm_shrink_classes to noop " +#endif + #define ckrm_shrink_classes() do { } while(0) #endif -- 2.47.0