version 1.138.4.3, 2008/01/08 22:11:40 |
version 1.151, 2008/02/14 11:45:24 |
Line 122 struct pool_item_header { |
|
Line 122 struct pool_item_header { |
|
SPLAY_ENTRY(pool_item_header) |
SPLAY_ENTRY(pool_item_header) |
ph_node; /* Off-page page headers */ |
ph_node; /* Off-page page headers */ |
void * ph_page; /* this page's address */ |
void * ph_page; /* this page's address */ |
struct timeval ph_time; /* last referenced */ |
uint32_t ph_time; /* last referenced */ |
uint16_t ph_nmissing; /* # of chunks in use */ |
uint16_t ph_nmissing; /* # of chunks in use */ |
uint16_t ph_off; /* start offset in page */ |
uint16_t ph_off; /* start offset in page */ |
union { |
union { |
Line 1300 pool_do_put(struct pool *pp, void *v, st |
|
Line 1300 pool_do_put(struct pool *pp, void *v, st |
|
* be idle for some period of time before it can |
* be idle for some period of time before it can |
* be reclaimed by the pagedaemon. This minimizes |
* be reclaimed by the pagedaemon. This minimizes |
* ping-pong'ing for memory. |
* ping-pong'ing for memory. |
|
* |
|
* note for 64-bit time_t: truncating to 32-bit is not |
|
* a problem for our usage. |
*/ |
*/ |
getmicrotime(&ph->ph_time); |
ph->ph_time = time_uptime; |
} |
} |
pool_update_curpage(pp); |
pool_update_curpage(pp); |
} |
} |
Line 1453 pool_prime_page(struct pool *pp, void *s |
|
Line 1456 pool_prime_page(struct pool *pp, void *s |
|
LIST_INIT(&ph->ph_itemlist); |
LIST_INIT(&ph->ph_itemlist); |
ph->ph_page = storage; |
ph->ph_page = storage; |
ph->ph_nmissing = 0; |
ph->ph_nmissing = 0; |
getmicrotime(&ph->ph_time); |
ph->ph_time = time_uptime; |
if ((pp->pr_roflags & PR_PHINPAGE) == 0) |
if ((pp->pr_roflags & PR_PHINPAGE) == 0) |
SPLAY_INSERT(phtree, &pp->pr_phtree, ph); |
SPLAY_INSERT(phtree, &pp->pr_phtree, ph); |
|
|
Line 1614 pool_reclaim(struct pool *pp) |
|
Line 1617 pool_reclaim(struct pool *pp) |
|
{ |
{ |
struct pool_item_header *ph, *phnext; |
struct pool_item_header *ph, *phnext; |
struct pool_pagelist pq; |
struct pool_pagelist pq; |
struct timeval curtime, diff; |
uint32_t curtime; |
bool klock; |
bool klock; |
int rv; |
int rv; |
|
|
Line 1651 pool_reclaim(struct pool *pp) |
|
Line 1654 pool_reclaim(struct pool *pp) |
|
|
|
LIST_INIT(&pq); |
LIST_INIT(&pq); |
|
|
getmicrotime(&curtime); |
curtime = time_uptime; |
|
|
for (ph = LIST_FIRST(&pp->pr_emptypages); ph != NULL; ph = phnext) { |
for (ph = LIST_FIRST(&pp->pr_emptypages); ph != NULL; ph = phnext) { |
phnext = LIST_NEXT(ph, ph_pagelist); |
phnext = LIST_NEXT(ph, ph_pagelist); |
Line 1661 pool_reclaim(struct pool *pp) |
|
Line 1664 pool_reclaim(struct pool *pp) |
|
break; |
break; |
|
|
KASSERT(ph->ph_nmissing == 0); |
KASSERT(ph->ph_nmissing == 0); |
timersub(&curtime, &ph->ph_time, &diff); |
if (curtime - ph->ph_time < pool_inactive_time |
if (diff.tv_sec < pool_inactive_time |
|
&& !pa_starved_p(pp->pr_alloc)) |
&& !pa_starved_p(pp->pr_alloc)) |
continue; |
continue; |
|
|
Line 1803 pool_print_pagelist(struct pool *pp, str |
|
Line 1805 pool_print_pagelist(struct pool *pp, str |
|
#endif |
#endif |
|
|
LIST_FOREACH(ph, pl, ph_pagelist) { |
LIST_FOREACH(ph, pl, ph_pagelist) { |
(*pr)("\t\tpage %p, nmissing %d, time %lu,%lu\n", |
(*pr)("\t\tpage %p, nmissing %d, time %" PRIu32 "\n", |
ph->ph_page, ph->ph_nmissing, |
ph->ph_page, ph->ph_nmissing, ph->ph_time); |
(u_long)ph->ph_time.tv_sec, |
|
(u_long)ph->ph_time.tv_usec); |
|
#ifdef DIAGNOSTIC |
#ifdef DIAGNOSTIC |
if (!(pp->pr_roflags & PR_NOTOUCH)) { |
if (!(pp->pr_roflags & PR_NOTOUCH)) { |
LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) { |
LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) { |
Line 2534 pool_cache_get_paddr(pool_cache_t pc, in |
|
Line 2534 pool_cache_get_paddr(pool_cache_t pc, in |
|
object = pcg->pcg_objects[--pcg->pcg_avail].pcgo_va; |
object = pcg->pcg_objects[--pcg->pcg_avail].pcgo_va; |
if (pap != NULL) |
if (pap != NULL) |
*pap = pcg->pcg_objects[pcg->pcg_avail].pcgo_pa; |
*pap = pcg->pcg_objects[pcg->pcg_avail].pcgo_pa; |
|
#if defined(DIAGNOSTIC) |
pcg->pcg_objects[pcg->pcg_avail].pcgo_va = NULL; |
pcg->pcg_objects[pcg->pcg_avail].pcgo_va = NULL; |
|
#endif /* defined(DIAGNOSTIC) */ |
KASSERT(pcg->pcg_avail <= pcg->pcg_size); |
KASSERT(pcg->pcg_avail <= pcg->pcg_size); |
KASSERT(object != NULL); |
KASSERT(object != NULL); |
cc->cc_hits++; |
cc->cc_hits++; |