1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cont.c: refined error message

Browse Source 
* cont.c (fiber_machine_stack_alloc): refined the error message on
  failure at setting a guard page.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-05-07 23:14:07 +00:00
parent 6c62356e5a
commit cd36bea568
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cont.c
View File

@ -769,6 +769,8 @@ fiber_entry(void *arg)
#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON) #define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
#endif #endif
#define ERRNOMSG strerror(errno)
static char* static char*
fiber_machine_stack_alloc(size_t size) fiber_machine_stack_alloc(size_t size)
{ {
@ -793,13 +795,13 @@ fiber_machine_stack_alloc(size_t size)
errno = 0; errno = 0;
ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0); ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
rb_raise(rb_eFiberError, "can't alloc machine stack to fiber: %s", strerror(errno)); rb_raise(rb_eFiberError, "can't alloc machine stack to fiber: %s", ERRNOMSG);
} }
/* guard page setup */ /* guard page setup */
page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0); page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0);
if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) { if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
rb_raise(rb_eFiberError, "mprotect failed"); rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
} }
} }