Skip to content

Commit 7fa6883

Browse files
committed
Bump max stack (-Xss) to 2048k, since Bundler eats it up.
1 parent 018ea90 commit 7fa6883

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

argparser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ void ArgParser::prepareOptions() {
419419
}
420420

421421
void ArgParser::setupMaxHeapAndStack() {
422-
// Hard-coded 500m, 1024k is for consistency with jruby shell script.
423-
string heapSize("500m"), stackSize("1024k");
422+
// Hard-coded 500m, 2048k is for consistency with jruby shell script.
423+
string heapSize("500m"), stackSize("2048k");
424424
bool maxHeap = false, maxStack = false;
425425
for (list<string>::iterator it = javaOptions.begin(); it != javaOptions.end(); it++) {
426426
if (!maxHeap && strncmp("-Xmx", it->c_str(), 4) == 0) {

spec/launcher_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
8787
end
8888

89-
it "should default to 1024k max stack" do
90-
jruby_launcher_args("").should include("-Xss1024k", "-Djruby.stack.max=1024k")
89+
it "should default to 2048k max stack" do
90+
jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
9191
end
9292

9393
it "should allow max stack to be overridden" do

0 commit comments

Comments
 (0)