mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-30 16:01:59 +01:00
87 lines
5.2 KiB
Diff
87 lines
5.2 KiB
Diff
--- a/OTP_VERSION
|
|
+++ b/OTP_VERSION
|
|
@@ -1 +1 @@
|
|
-18.0
|
|
+18.0.1
|
|
--- a/erts/doc/src/notes.xml
|
|
+++ b/erts/doc/src/notes.xml
|
|
@@ -31,6 +31,22 @@
|
|
</header>
|
|
<p>This document describes the changes made to the ERTS application.</p>
|
|
|
|
+<section><title>Erts 7.0.1</title>
|
|
+
|
|
+ <section><title>Fixed Bugs and Malfunctions</title>
|
|
+ <list>
|
|
+ <item>
|
|
+ <p>
|
|
+ Fix a rare hanging of the VM seen to happen just after
|
|
+ emulator start. Bug exists since R14.</p>
|
|
+ <p>
|
|
+ Own Id: OTP-12859 Aux Id: seq12882 </p>
|
|
+ </item>
|
|
+ </list>
|
|
+ </section>
|
|
+
|
|
+</section>
|
|
+
|
|
<section><title>Erts 7.0</title>
|
|
|
|
<section><title>Fixed Bugs and Malfunctions</title>
|
|
--- a/erts/emulator/sys/common/erl_poll.c
|
|
+++ b/erts/emulator/sys/common/erl_poll.c
|
|
@@ -431,7 +431,7 @@ static ERTS_INLINE int
|
|
is_interrupted_reset(ErtsPollSet ps)
|
|
{
|
|
#if defined(USE_THREADS) || ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
|
|
- return (erts_atomic32_xchg_nob(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN)
|
|
+ return (erts_atomic32_xchg_acqb(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN)
|
|
== ERTS_POLL_WOKEN_INTR);
|
|
#else
|
|
return 0;
|
|
@@ -442,7 +442,7 @@ static ERTS_INLINE void
|
|
woke_up(ErtsPollSet ps)
|
|
{
|
|
#if defined(USE_THREADS) || ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
|
|
- erts_aint32_t wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
|
|
+ erts_aint32_t wakeup_state = erts_atomic32_read_acqb(&ps->wakeup_state);
|
|
if (wakeup_state == ERTS_POLL_NOT_WOKEN)
|
|
(void) erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
|
|
ERTS_POLL_WOKEN,
|
|
@@ -469,14 +469,9 @@ wake_poller(ErtsPollSet ps, int interrupted, int async_signal_safe)
|
|
wakeup_state = erts_atomic32_cmpxchg_relb(&ps->wakeup_state,
|
|
ERTS_POLL_WOKEN,
|
|
ERTS_POLL_NOT_WOKEN);
|
|
- else {
|
|
- /*
|
|
- * We might unnecessarily write to the pipe, however,
|
|
- * that isn't problematic.
|
|
- */
|
|
- wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
|
|
- erts_atomic32_set_relb(&ps->wakeup_state, ERTS_POLL_WOKEN_INTR);
|
|
- }
|
|
+ else
|
|
+ wakeup_state = erts_atomic32_xchg_relb(&ps->wakeup_state,
|
|
+ ERTS_POLL_WOKEN_INTR);
|
|
wake = wakeup_state == ERTS_POLL_NOT_WOKEN;
|
|
}
|
|
/*
|
|
--- a/erts/vsn.mk
|
|
+++ b/erts/vsn.mk
|
|
@@ -18,7 +18,7 @@
|
|
# %CopyrightEnd%
|
|
#
|
|
|
|
-VSN = 7.0
|
|
+VSN = 7.0.1
|
|
|
|
# Port number 4365 in 4.2
|
|
# Port number 4366 in 4.3
|
|
--- a/otp_versions.table
|
|
+++ b/otp_versions.table
|
|
@@ -1,3 +1,4 @@
|
|
+OTP-18.0.1 : erts-7.0.1 # asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 :
|
|
OTP-18.0 : asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 erts-7.0 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 # :
|
|
OTP-17.5.6 : inets-5.10.9 ssh-3.2.4 ssl-6.0.1 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 diameter-1.9.2 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.2 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
|
|
OTP-17.5.5 : diameter-1.9.2 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.8 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.2 ssh-3.2.3 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
|