From e68fde947e540c38366d6888dfd6945efb49a880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?=
Date: Tue, 7 Jun 2011 01:37:20 +0200
Subject: Detect the available CPUs on IRIX
Add support for querying the number of configured and online processors
on SGI systems running IRIX.
---
erts/lib_src/common/erl_misc_utils.c | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'erts')
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 5dbf98c7d1..0871ece0b0 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -55,6 +55,12 @@
# ifdef HAVE_UNISTD_H
# include
# endif
+# if defined(_SC_NPROC_CONF) && !defined(_SC_NPROCESSORS_CONF)
+# define _SC_NPROCESSORS_CONF _SC_NPROC_CONF
+# endif
+# if defined(_SC_NPROC_ONLN) && !defined(_SC_NPROCESSORS_ONLN)
+# define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN
+# endif
# if (defined(NO_SYSCONF) || !defined(_SC_NPROCESSORS_CONF))
# ifdef HAVE_SYS_SYSCTL_H
# include
--
cgit v1.2.3
From 32228c665506b1d84e0758c81fcb9ff3d8f8bef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?=
Date: Wed, 13 Jul 2011 15:49:04 +0200
Subject: Let epmd ignore empty ERL_EPMD_ADDRESS
If the environment variable ERL_EPMD_ADDRESS is set to the empty string,
empd now behaves like it does by default when ERL_EPMD_ADDRESS is unset.
That is, in this case, epmd now listens on all available interfaces
instead of using only the loopback interface, which happened because
epmd added the loopback address to the (in this case empty) list of
addresses specified via ERL_EPMD_ADDRESS.
Also, epmd now ignores ERL_EPMD_ADDRESS if it contains only separator
characters (comma and space).
The same applies to epmd's -address option.
---
erts/epmd/src/epmd_srv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'erts')
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 5debae26b6..da575affa1 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -102,7 +102,8 @@ void run(EpmdVars *g)
dbg_printf(g,2,"try to initiate listening port %d", g->port);
- if (g->addresses != NULL)
+ if (g->addresses != NULL && /* String contains non-separator characters if: */
+ g->addresses[strspn(g->addresses," ,")] != '\000')
{
char *tmp;
char *token;
--
cgit v1.2.3
From 52230a417ad005711876132d144b3fe8a72d7e8e Mon Sep 17 00:00:00 2001
From: Dave Cottlehuber
Date: Thu, 11 Aug 2011 13:21:16 +1200
Subject: Fix win32 OpenSSL static linking broken in 20c9d6e
---
erts/configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'erts')
diff --git a/erts/configure.in b/erts/configure.in
index fac07f8b6a..ffa68cd296 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3722,7 +3722,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
SSL_RUNTIME_LIBDIR="$rdir/lib"
SSL_LIBDIR="$dir/lib"
SSL_CRYPTO_LIBNAME=libeay32
- SSL_CRYPTO_LIBNAME=ssleay32
+ SSL_SSL_LIBNAME=ssleay32
elif test -f "$dir/lib/openssl.lib"; then
SSL_RUNTIME_LIBDIR="$rdir/lib"
SSL_LIBDIR="$dir/lib"
@@ -3904,7 +3904,7 @@ dnl so it is - be adoptable
elif test -f "$with_ssl/lib/libeay32.lib"; then
SSL_LIBDIR="$with_ssl/lib"
SSL_CRYPTO_LIBNAME=libeay32
- SSL_CRYPTO_LIBNAME=ssleay32
+ SSL_SSL_LIBNAME=ssleay32
else
# This probably wont work, but that's what the user said, so...
SSL_LIBDIR="$with_ssl/lib"
--
cgit v1.2.3
From 1b2cea397131a36a39b18c6ce8c6944bf11db4c7 Mon Sep 17 00:00:00 2001
From: Filipe David Manana
Date: Mon, 16 May 2011 17:00:25 +0100
Subject: Add erlang:external_size/2 BIF
This BIF's second parameter is a list of options.
Currently the only allowed option is {minor_version, Version}
where version is either 0 (default) or 1.
---
erts/doc/src/erlang.xml | 50 +++++++++++++++++++++++++++++++++++++
erts/emulator/beam/bif.tab | 2 ++
erts/emulator/beam/external.c | 49 ++++++++++++++++++++++++++++++++++++
erts/emulator/beam/external.h | 1 +
erts/emulator/test/binary_SUITE.erl | 16 ++++++++++--
5 files changed, 116 insertions(+), 2 deletions(-)
(limited to 'erts')
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index ad7a57bd73..84d4160e6a 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1034,6 +1034,56 @@ b
exit reason killed.
+
+ erlang:external_size(Term) -> integer() >= 0
+ Calculate the maximum size for a term encoded in the Erlang
+ external term format
+
+ Term = term()
+
+
+
Calculates, without doing the encoding, the maximum byte size for
+ a term encoded in the Erlang external term format. The following
+ condition applies always:
This is equivalent to a call to: erlang:external_size(Term, [])
+
+
+
+
+ erlang:external_size(Term, [Option]) -> integer() >= 0
+ Calculate the maximum size for a term encoded in the Erlang
+ external term format
+
+ Term = term()
+ Option = {minor_version, Version}
+
+
+
Calculates, without doing the encoding, the maximum byte size for
+ a term encoded in the Erlang external term format. The following
+ condition applies always: