From b8b99e80b7a26383163aeadfb612f6e34e85a05c Mon Sep 17 00:00:00 2001
From: Petrik <petrik@deheus.net>
Date: Tue, 29 Oct 2024 14:29:08 +0100
Subject: [PATCH] [ruby/rack] Use java_tune.sh script for rack-jruby

This should improve `rack-jruby` performance.
Also remove `java_tune.sh` from frameworks that no longer test with
JRuby.
---
 .../{rack-sequel => rack}/config/java_tune.sh  |  0
 frameworks/Ruby/rack/rack-jruby.dockerfile     |  2 ++
 .../Ruby/sinatra-sequel/config/java_tune.sh    | 18 ------------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 rename frameworks/Ruby/{rack-sequel => rack}/config/java_tune.sh (100%)
 delete mode 100644 frameworks/Ruby/sinatra-sequel/config/java_tune.sh

diff --git a/frameworks/Ruby/rack-sequel/config/java_tune.sh b/frameworks/Ruby/rack/config/java_tune.sh
similarity index 100%
rename from frameworks/Ruby/rack-sequel/config/java_tune.sh
rename to frameworks/Ruby/rack/config/java_tune.sh
diff --git a/frameworks/Ruby/rack/rack-jruby.dockerfile b/frameworks/Ruby/rack/rack-jruby.dockerfile
index ab06ae132ed..c280cca6ac8 100644
--- a/frameworks/Ruby/rack/rack-jruby.dockerfile
+++ b/frameworks/Ruby/rack/rack-jruby.dockerfile
@@ -13,4 +13,6 @@ COPY . .
 
 EXPOSE 8080
 
+CMD config/java_tune.sh
+
 CMD bundle exec puma -C config/puma.rb -b tcp://0.0.0.0:8080 -e production
diff --git a/frameworks/Ruby/sinatra-sequel/config/java_tune.sh b/frameworks/Ruby/sinatra-sequel/config/java_tune.sh
deleted file mode 100644
index 412b1e74fdc..00000000000
--- a/frameworks/Ruby/sinatra-sequel/config/java_tune.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-stack_size=1
-cache_size=240
-meta_size=192
-avail_mem=$(awk '/^MemAvailable/ { print int(0.6 * $2 / 1024); exit }' /proc/meminfo)
-heap_size=$(( avail_mem - meta_size - cache_size - (stack_size * MAX_CONCURRENCY * THREAD_FACTOR) ))
-
-JRUBY_OPTS="-J-server -J-XX:+AggressiveOpts -J-Djava.net.preferIPv4Stack=true"
-#JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseSerialGC"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:+CMSClassUnloadingEnabled -J-XX:+UseConcMarkSweepGC"
-#JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseG1GC -J-XX:+UseStringDeduplication"
-JRUBY_OPTS="$JRUBY_OPTS -J-Xms${heap_size}m -J-Xmx${heap_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-Xss${stack_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:MaxMetaspaceSize=${meta_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:ReservedCodeCacheSize=${cache_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -Xcompile.invokedynamic=true -J-XX:+UseNUMA -J-XX:+AlwaysPreTouch"
-
-export JRUBY_OPTS