Skip to content

Commit

Permalink
Merge #6296
Browse files Browse the repository at this point in the history
6296: Fixing error message about use_guard_pages r=hkaiser a=hkaiser

Fixes #6288


Co-authored-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>
  • Loading branch information
StellarBot and hkaiser committed Jul 8, 2023
2 parents 907670c + 0cfd70c commit 5b7fbc8
Showing 1 changed file with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ namespace hpx::threads::coroutines::detail::posix {
"mmap() failed to allocate thread stack";
if (ENOMEM == errno && use_guard_pages)
{
error_message =
"mmap() failed to allocate thread stack due to "
"insufficient resources, increase "
"/proc/sys/vm/max_map_count or add "
"-Ihpx.stacks.use_guard_pages=0 to the command line";
error_message = "mmap() failed to allocate thread stack due to "
" insufficient resources, increase "
"/proc/sys/vm/max_map_count or add "
"--hpx:ini=hpx.stacks.use_guard_pages=0 to the "
"command line";
}
throw std::runtime_error(error_message);
}
Expand Down Expand Up @@ -171,7 +171,8 @@ namespace hpx::threads::coroutines::detail::posix {
#endif
}

#else // non-mmap()
#else
// non-mmap()

//this should be a fine default.
static constexpr std::size_t const stack_alignment = sizeof(void*) > 16 ?
Expand Down

0 comments on commit 5b7fbc8

Please sign in to comment.