summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid CARLIER <devnexen@gmail.com>2021-03-23 18:39:36 +0000
committerSamuel Williams <samuel.williams@oriontransfer.co.nz>2021-03-29 09:32:40 +1300
commit875c85a8bdca6cc2c7d0a26291ec4a6b2647b195 (patch)
tree58863d5c1c76e80505a062f0d6da183846d57873
parenta1938ec308543d1649069bddd3bf0aeb541f3804 (diff)
fiber context update for Mac OS.
it is more about memory accounting sake. At allocation time, we make clear we re possibly reusing regions marked as reusable. Noted also calls might not necessarily succeed at first so we do only when necessary.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4313
-rw-r--r--cont.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/cont.c b/cont.c
index 7fbca90..0d95a09 100644
--- a/cont.c
+++ b/cont.c
@@ -433,6 +433,12 @@ fiber_pool_allocate_memory(size_t * count, size_t stride)
*count = (*count) >> 1;
}
else {
+#if defined(MADV_FREE_REUSE)
+ // On Mac MADV_FREE_REUSE is necessary for the task_info api
+ // to keep the accounting accurate as possible when a page is marked as reusable
+ // it can possibly not occuring at first call thus re-iterating if necessary.
+ while (madvise(base, (*count)*stride, MADV_FREE_REUSE) == -1 && errno == EAGAIN);
+#endif
return base;
}
#endif
@@ -649,7 +655,11 @@ fiber_pool_stack_free(struct fiber_pool_stack * stack)
#elif defined(POSIX_MADV_DONTNEED)
posix_madvise(base, size, POSIX_MADV_DONTNEED);
#elif defined(MADV_FREE_REUSABLE)
- madvise(base, size, MADV_FREE_REUSABLE);
+ // Acknowledge the kernel down to the task info api we make this
+ // page reusable for future use.
+ // As for MADV_FREE_REUSE below we ensure in the rare occassions the task was not
+ // completed at the time of the call to re-iterate.
+ while (madvise(base, size, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN);
#elif defined(MADV_FREE)
madvise(base, size, MADV_FREE);
#elif defined(MADV_DONTNEED)