archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8236569: -Xss not multiple of 4K does not work for the main thread on macOS

Browse source 
Reviewed-by: dholmes, stuefe
This commit is contained in:
Adam Sotona 2022-06-01 06:13:29 +00:00
parent 7159976335
commit 7846971381
4 changed files with 43 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/macosx/native/libjli/java_md_macosx.m
View file

@ -46,6 +46,7 @@
#include <errno.h>
#include <spawn.h>
#include <unistd.h>
struct NSAppArgs {
int argc;
@ -722,6 +723,20 @@ static void* ThreadJavaMain(void* args) {
return (void*)(intptr_t)JavaMain(args);
}
static size_t adjustStackSize(size_t stack_size) {
long page_size = getpagesize();
if (stack_size % page_size == 0) {
return stack_size;
} else {
long pages = stack_size / page_size;
// Ensure we don't go over limit
if (stack_size <= SIZE_MAX - page_size) {
pages++;
}
return page_size * pages;
}
}
/*
* Block current thread and continue execution in a new thread.
*/
@ -734,7 +749,7 @@ CallJavaMainInNewThread(jlong stack_size, void* args) {
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
if (stack_size > 0) {
pthread_attr_setstacksize(&attr, stack_size);
pthread_attr_setstacksize(&attr, adjustStackSize(stack_size));
}
pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads