mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-09-20 20:35:20 +00:00
Code Releases Activity

Page cleanup routines updated to allow nested birdloops

Browse Source
This commit is contained in:
Maria Matejka 2022-01-10 14:49:58 +01:00
parent 87512ccdff
commit b5155d5cea
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sysdep/unix/alloc.c
View File

@ -61,7 +61,7 @@ alloc_page(void)
node *n = HEAD(fp->list); node *n = HEAD(fp->list);
rem_node(n); rem_node(n);
if ((--fp->cnt < fp->min) && !shutting_down) if ((--fp->cnt < fp->min) && !shutting_down)
ev_send(&global_work_list, fp->cleanup); ev_send(fp->cleanup->list, fp->cleanup);
void *ptr = n - FP_NODE_OFFSET; void *ptr = n - FP_NODE_OFFSET;
memset(ptr, 0, page_size); memset(ptr, 0, page_size);
@ -94,7 +94,7 @@ free_page(void *ptr)
memset(n, 0, sizeof(node)); memset(n, 0, sizeof(node));
add_tail(&fp->list, n); add_tail(&fp->list, n);
if ((++fp->cnt > fp->max) && !shutting_down) if ((++fp->cnt > fp->max) && !shutting_down)
ev_send(&global_work_list, fp->cleanup); ev_send(fp->cleanup->list, fp->cleanup);
} }
else else
#endif #endif
@ -108,18 +108,21 @@ free_page(void *ptr)
void void
flush_pages(struct birdloop *loop) flush_pages(struct birdloop *loop)
{ {
ASSERT_DIE(birdloop_inside(&main_birdloop)); ASSERT_DIE(birdloop_inside(loop->parent->loop));
add_tail_list(&GFP->list, &loop->pages.list); struct free_pages *fp = &loop->pages;
GFP->cnt += loop->pages.cnt; struct free_pages *pfp = &loop->parent->loop->pages;
loop->pages.cnt = 0; add_tail_list(&pfp->list, &fp->list);
loop->pages.list = (list) {}; pfp->cnt += fp->cnt;
loop->pages.min = 0;
loop->pages.max = 0;
rfree(loop->pages.cleanup); fp->cnt = 0;
loop->pages.cleanup = NULL; fp->list = (list) {};
fp->min = 0;
fp->max = 0;
rfree(fp->cleanup);
fp->cleanup = NULL;
} }
static void static void
@ -128,15 +131,18 @@ cleanup_pages(void *data)
struct birdloop *loop = data; struct birdloop *loop = data;
birdloop_enter(loop); birdloop_enter(loop);
struct free_pages *fp = &birdloop_current->pages; ASSERT_DIE(birdloop_inside(loop->parent->loop));
while ((fp->cnt < fp->min) && (GFP->cnt > GFP->min)) struct free_pages *fp = &loop->pages;
struct free_pages *pfp = &loop->parent->loop->pages;
while ((fp->cnt < fp->min) && (pfp->cnt > pfp->min))
{ {
node *n = HEAD(GFP->list); node *n = HEAD(pfp->list);
rem_node(n); rem_node(n);
add_tail(&fp->list, n); add_tail(&fp->list, n);
fp->cnt++; fp->cnt++;
GFP->cnt--; pfp->cnt--;
} }
while (fp->cnt < fp->min) while (fp->cnt < fp->min)
@ -150,15 +156,15 @@ cleanup_pages(void *data)
{ {
node *n = HEAD(fp->list); node *n = HEAD(fp->list);
rem_node(n); rem_node(n);
add_tail(&GFP->list, n); add_tail(&pfp->list, n);
fp->cnt--; fp->cnt--;
GFP->cnt++; pfp->cnt++;
} }
birdloop_leave(loop); birdloop_leave(loop);
if (!shutting_down && (GFP->cnt > GFP->max)) if (!shutting_down && (pfp->cnt > pfp->max))
ev_send(&global_work_list, GFP->cleanup); ev_send(pfp->cleanup->list, pfp->cleanup);
} }
static void static void
@ -191,7 +197,8 @@ init_pages(struct birdloop *loop)
struct free_pages *fp = &loop->pages; struct free_pages *fp = &loop->pages;
init_list(&fp->list); init_list(&fp->list);
fp->cleanup = ev_new_init(&root_pool, cleanup_pages, loop); fp->cleanup = ev_new_init(loop->parent->loop->pool, cleanup_pages, loop);
fp->cleanup->list = (loop->parent->loop == &main_birdloop) ? &global_work_list : birdloop_event_list(loop->parent->loop);
fp->min = 4; fp->min = 4;
fp->max = 16; fp->max = 16;
@ -202,7 +209,7 @@ init_pages(struct birdloop *loop)
} }
} }
static event global_free_pages_cleanup_event = { .hook = cleanup_global_pages }; static event global_free_pages_cleanup_event = { .hook = cleanup_global_pages, .list = &global_work_list };
void resource_sys_init(void) void resource_sys_init(void)
{ {