Skip to content

Clean up code around JRuby 10, re-enable optimizations #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sharpie merged 4 commits into from
Jul 7, 2026
Merged

Clean up code around JRuby 10, re-enable optimizations #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b61d6b9
Remove jruby.invokedynamic.yield override
Sharpie Jul 7, 2026
02566c8
Remove jruby.ji.class.values override
Sharpie Jul 7, 2026
24b14f4
Remove unused imports from jruby_core.clj
Sharpie Jul 7, 2026
fe86e92
Remove unused imports from ScriptingContainer.java
Sharpie Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@
(.setCompileMode (get-compile-mode compile-mode)))
(set-ruby-encoding KCode/UTF8 jruby)
(setup-profiling jruby profiler-output-file profiling-mode)
;; FIXME: This was fixed in JRuby 9.2.15.0. Revert to the default of
;; "true" when taking up JRuby 10.
(System/setProperty "jruby.invokedynamic.yield" "false")
;; This fixes a memory leak introduced in JRuby 9.4.13.0 and fixed
;; in 10.0.5.0.
(System/setProperty "jruby.ji.class.values" "HARD_MAP")
(initialize-scripting-container-fn jruby config)))

(schema/defn ^:always-validate empty-scripting-container :- ScriptingContainer
Expand Down
2 changes: 0 additions & 2 deletions src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
[puppetlabs.ring-middleware.utils :as ringutils]
[puppetlabs.services.jruby-pool-manager.jruby-schemas :as jruby-schemas]
[puppetlabs.services.jruby-pool-manager.impl.jruby-internal :as jruby-internal]
[puppetlabs.services.jruby-pool-manager.impl.jruby-agents :as jruby-agents]
[puppetlabs.services.jruby-pool-manager.impl.jruby-events :as jruby-events]
[clojure.java.io :as io]
[clojure.tools.logging :as log]
[slingshot.slingshot :as sling]
[puppetlabs.i18n.core :as i18n]
[me.raynes.fs :as fs]
Expand Down
2 changes: 0 additions & 2 deletions src/java/com/puppetlabs/jruby_utils/jruby/ScriptingContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.puppetlabs.jruby_utils.jruby;

import org.jruby.embed.EmbedEvalUnit;
import org.jruby.embed.EmbedRubyInstanceConfigAdapter;
import org.jruby.runtime.Block;

/**
*/
Expand Down