Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 445762 Details for
Bug 591970
dev-lang/erlang-19.1 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
erlang-19.0.6-to-19.0.7.patch
erlang-19.0.6-to-19.0.7.patch (text/plain), 6.90 KB, created by
Kenneth Lakin
on 2016-09-15 05:03:48 UTC
(
hide
)
Description:
erlang-19.0.6-to-19.0.7.patch
Filename:
MIME Type:
Creator:
Kenneth Lakin
Created:
2016-09-15 05:03:48 UTC
Size:
6.90 KB
patch
obsolete
>From 57513239dc265373521bc4f04c154f17d5f0bae9 Mon Sep 17 00:00:00 2001 >From: Rickard Green <rickard@erlang.org> >Date: Wed, 14 Sep 2016 12:58:27 +0200 >Subject: [PATCH 1/4] Update vheap size when moving msgq to heap after GC > >--- > erts/emulator/beam/erl_gc.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > >diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c >index 9e0919c..e2875ce 100644 >--- a/erts/emulator/beam/erl_gc.c >+++ b/erts/emulator/beam/erl_gc.c >@@ -150,6 +150,7 @@ static void move_msgq_to_heap(Process *p); > static int reached_max_heap_size(Process *p, Uint total_heap_size, > Uint extra_heap_size, Uint extra_old_heap_size); > static void init_gc_info(ErtsGCInfo *gcip); >+static Uint64 next_vheap_size(Process* p, Uint64 vheap, Uint64 vheap_sz); > > #ifdef HARDDEBUG > static void disallow_heap_frag_ref_in_heap(Process* p); >@@ -748,6 +749,9 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end, > p->last_old_htop = p->old_htop; > #endif > >+ ASSERT(!p->mbuf); >+ ASSERT(!ERTS_IS_GC_DESIRED(p)); >+ > return reds; > } > >@@ -2250,7 +2254,9 @@ copy_one_frag(Eterm** hpp, ErlOffHeap* off_heap, > static void > move_msgq_to_heap(Process *p) > { >+ > ErtsMessage **mpp = &p->msg.first; >+ Uint64 pre_oh = MSO(p).overhead; > > while (*mpp) { > ErtsMessage *mp = *mpp; >@@ -2293,6 +2299,11 @@ move_msgq_to_heap(Process *p) > > mpp = &(*mpp)->next; > } >+ >+ if (pre_oh != MSO(p).overhead) { >+ /* Got new binaries; update vheap size... */ >+ BIN_VHEAP_SZ(p) = next_vheap_size(p, MSO(p).overhead, BIN_VHEAP_SZ(p)); >+ } > } > > static Uint > >From 25ea6279b55db5af53040ec4ce9bf73b4aeeaa16 Mon Sep 17 00:00:00 2001 >From: Rickard Green <rickard@erlang.org> >Date: Wed, 14 Sep 2016 13:20:53 +0200 >Subject: [PATCH 2/4] Ensure we dont use an invalid live heap fragment pointer > >--- > erts/emulator/beam/erl_gc.c | 5 +++++ > 1 file changed, 5 insertions(+) > >diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c >index e2875ce..027ade4 100644 >--- a/erts/emulator/beam/erl_gc.c >+++ b/erts/emulator/beam/erl_gc.c >@@ -388,6 +388,11 @@ erts_gc_after_bif_call_lhf(Process* p, ErlHeapFragment *live_hf_end, > return result; > } > >+ if (!p->mbuf) { >+ /* Must have GC:d in BIF call... invalidate live_hf_end */ >+ live_hf_end = ERTS_INVALID_HFRAG_PTR; >+ } >+ > if (is_non_value(result)) { > if (p->freason == TRAP) { > #if HIPE > >From 03dbdd45080139ee5ea083dd5153ec6056db1d1d Mon Sep 17 00:00:00 2001 >From: Erlang/OTP <otp@erlang.org> >Date: Wed, 14 Sep 2016 13:33:10 +0200 >Subject: [PATCH 3/4] Prepare release > >--- > erts/doc/src/notes.xml | 17 +++++++++++++++++ > erts/vsn.mk | 2 +- > 2 files changed, 18 insertions(+), 1 deletion(-) > >diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml >index 517ea3b..72d2837 100644 >--- a/erts/doc/src/notes.xml >+++ b/erts/doc/src/notes.xml >@@ -32,6 +32,23 @@ > <p>This document describes the changes made to the ERTS application.</p> > > >+<section><title>Erts 8.0.5</title> >+ >+ <section><title>Fixed Bugs and Malfunctions</title> >+ <list> >+ <item> >+ <p> >+ Fixed a VM crash that occured in a garbage collection of >+ a process when it had received binaries. This bug was >+ introduced in ERTS version 8.0 (OTP 19.0).</p> >+ <p> >+ Own Id: OTP-13890</p> >+ </item> >+ </list> >+ </section> >+ >+</section> >+ > <section><title>Erts 8.0.4</title> > > <section><title>Fixed Bugs and Malfunctions</title> >diff --git a/erts/vsn.mk b/erts/vsn.mk >index d9c441e..95d0e7b 100644 >--- a/erts/vsn.mk >+++ b/erts/vsn.mk >@@ -18,7 +18,7 @@ > # %CopyrightEnd% > # > >-VSN = 8.0.4 >+VSN = 8.0.5 > > # Port number 4365 in 4.2 > # Port number 4366 in 4.3 > >From 33b39b559a31c38465dfc038218f432c9c60a9ad Mon Sep 17 00:00:00 2001 >From: Erlang/OTP <otp@erlang.org> >Date: Wed, 14 Sep 2016 13:33:11 +0200 >Subject: [PATCH 4/4] Updated OTP version > >--- > OTP_VERSION | 2 +- > otp_versions.table | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > >diff --git a/OTP_VERSION b/OTP_VERSION >index 309a411..a2f825e 100644 >--- a/OTP_VERSION >+++ b/OTP_VERSION >@@ -1 +1 @@ >-19.0.6 >+19.0.7 >diff --git a/otp_versions.table b/otp_versions.table >index db1f9df..de25fab 100644 >--- a/otp_versions.table >+++ b/otp_versions.table >@@ -1,3 +1,4 @@ >+OTP-19.0.7 : erts-8.0.5 # asn1-4.0.3 common_test-1.12.2 compiler-7.0.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0.1 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3.2 jinterface-1.7 kernel-5.0.2 megaco-3.18.1 mnesia-4.14 observer-2.2.1 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3.1 ssl-8.0.1 stdlib-3.0.1 syntax_tools-2.0 tools-2.8.5 typer-0.9.11 wx-1.7 xmerl-1.3.11 : > OTP-19.0.6 : erts-8.0.4 # asn1-4.0.3 common_test-1.12.2 compiler-7.0.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0.1 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3.2 jinterface-1.7 kernel-5.0.2 megaco-3.18.1 mnesia-4.14 observer-2.2.1 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3.1 ssl-8.0.1 stdlib-3.0.1 syntax_tools-2.0 tools-2.8.5 typer-0.9.11 wx-1.7 xmerl-1.3.11 : > OTP-19.0.5 : kernel-5.0.2 # asn1-4.0.3 common_test-1.12.2 compiler-7.0.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0.1 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 erts-8.0.3 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3.2 jinterface-1.7 megaco-3.18.1 mnesia-4.14 observer-2.2.1 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3.1 ssl-8.0.1 stdlib-3.0.1 syntax_tools-2.0 tools-2.8.5 typer-0.9.11 wx-1.7 xmerl-1.3.11 : > OTP-19.0.4 : erts-8.0.3 # asn1-4.0.3 common_test-1.12.2 compiler-7.0.1 cosEvent-2.2.1 cosEventDomain-1.2.1 cosFileTransfer-1.2.1 cosNotification-1.2.2 cosProperty-1.2.1 cosTime-1.2.2 cosTransactions-1.3.2 crypto-3.7 debugger-4.2 dialyzer-3.0.1 diameter-1.12 edoc-0.7.19 eldap-1.2.2 erl_docgen-0.5 erl_interface-3.9 et-1.6 eunit-2.3 gs-1.6.1 hipe-3.15.1 ic-4.4.1 inets-6.3.2 jinterface-1.7 kernel-5.0.1 megaco-3.18.1 mnesia-4.14 observer-2.2.1 odbc-2.11.2 orber-3.8.2 os_mon-2.4.1 otp_mibs-1.1.1 parsetools-2.1.2 percept-0.9 public_key-1.2 reltool-0.7.1 runtime_tools-1.10 sasl-3.0 snmp-5.2.3 ssh-4.3.1 ssl-8.0.1 stdlib-3.0.1 syntax_tools-2.0 tools-2.8.5 typer-0.9.11 wx-1.7 xmerl-1.3.11 :
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 591970
:
443992
|
443994
|
443996
|
443998
|
444000
|
444002
|
445760
|
445762
|
445764
|
447264
|
447266