Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
omnibus-heptapod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
omnibus-heptapod
Commits
1a406d88
Commit
1a406d88
authored
1 year ago
by
Paul Phillips
Browse files
Options
Downloads
Patches
Plain Diff
Update Ruby 3.2 build to 3.2.3
parent
88488449
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!128
heptapod#1534: making 1.5 the oldstable
,
!125
heptapod#1494: make 1.5 the new stable
,
!123
Omnibus GitLab for upstream 16.10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch
+0
-23
0 additions, 23 deletions
config/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch
config/software/ruby.rb
+8
-3
8 additions, 3 deletions
config/software/ruby.rb
with
8 additions
and
26 deletions
config/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch
deleted
100644 → 0
+
0
−
23
View file @
88488449
diff --git a/gc.c b/gc.c
index 54400e4f6b..96d43ac8ac 100644
--- a/gc.c
+++ b/gc.c
@@ -12614,8 +12614,16 @@
ruby_xrealloc2_body(void *ptr, size_t n, size_t size)
void
ruby_sized_xfree(void *x, size_t size)
{
- if (x) {
- objspace_xfree(&rb_objspace, x, size);
+ if (LIKELY(x)) {
+ /* It's possible for a C extension's pthread destructor function set by pthread_key_create
+ * to be called after ruby_vm_destruct and attempt to free memory. Fall back to mimfree in
+ * that case. */
+ if (LIKELY(GET_VM())) {
+ objspace_xfree(&rb_objspace, x, size);
+ }
+ else {
+ ruby_mimfree(x);
+ }
}
}
This diff is collapsed.
Click to expand it.
config/software/ruby.rb
+
8
−
3
View file @
1a406d88
...
...
@@ -68,7 +68,7 @@
version
(
'3.0.6'
)
{
source
sha256:
'6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e'
}
version
(
'3.1.4'
)
{
source
sha256:
'a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6'
}
version
(
'3.2.
2
'
)
{
source
sha256:
'
96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc
'
}
version
(
'3.2.
3
'
)
{
source
sha256:
'
af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba
'
}
source
url:
"https://cache.ruby-lang.org/pub/ruby/
#{
version
.
match
(
/^(\d+\.\d+)/
)[
0
]
}
/ruby-
#{
version
}
.tar.gz"
...
...
@@ -109,8 +109,13 @@
# 1. Enable custom patch created by ayufan that allows to count memory allocations
# per-thread. This is asked to be upstreamed as part of https://github.com/ruby/ruby/pull/3978
# 2. Backport Ruby upstream patch to fix seg faults in libxml2/Nokogiri: https://bugs.ruby-lang.org/issues/19580
# This has been merged for Ruby 3.3 but not yet backported: https://github.com/ruby/ruby/pull/7663
patches
=
%w[thread-memory-allocations fix-ruby-xfree-for-libxml2]
# This has been merged for Ruby 3.2.3 but not yet backported: https://github.com/ruby/ruby/pull/7663
patches
=
if
version
.
satisfies?
(
'>= 3.2.3'
)
%w[thread-memory-allocations]
else
%w[thread-memory-allocations fix-ruby-xfree-for-libxml2]
end
ruby_version
=
Gem
::
Version
.
new
(
version
).
canonical_segments
[
0
..
1
].
join
(
'.'
)
patches
.
each
do
|
patch_name
|
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment