From 1ae1996053a1a621cb2d013a3f8377accde78f00 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 27 May 2011 15:41:47 +0200 Subject: Add command start_disabled to erlsrv --- erts/doc/src/erlsrv.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'erts/doc') diff --git a/erts/doc/src/erlsrv.xml b/erts/doc/src/erlsrv.xml index 0dfad2a112..d9f7fdd309 100644 --- a/erts/doc/src/erlsrv.xml +++ b/erts/doc/src/erlsrv.xml @@ -273,7 +273,7 @@ - erlsrv {start | stop | disable | enable} <service-name> + erlsrv {start | start_disabled | stop | disable | enable} <service-name> Manipulate the current service status.

These commands are only added for convenience, the normal @@ -287,6 +287,21 @@ service actually is stopped. Enabling a service sets it in automatic mode, that is started at boot. This command cannot set the service to manual.

+ +

The start_disabled command operates on a service + regardless of if it's enabled/disabled or started/stopped. It + does this by first enabling it (regardless of if it' enabled + or not), then starting it (if it's not already started) and + then disabling it. The result will be a disabled but started + service, regardless of it's earlier state. This is useful for + starting services temporarily during a release upgrade. The + difference between using start_disabled and the + sequence enable, start and disable is + that all other erlsrv commands are locked out during + the sequence of operations in start_disable, making the + operation atomic from an erlsrv user's point of + view.

+ -- cgit v1.2.3 From d634d08090677e1f0f0d41a461c7ad8b688e1afd Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 27 May 2011 16:38:14 +0200 Subject: Convert windows start_erl to take rootdir on command line --- erts/doc/src/start_erl.xml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'erts/doc') diff --git a/erts/doc/src/start_erl.xml b/erts/doc/src/start_erl.xml index 21cc901f52..6f6930af7e 100644 --- a/erts/doc/src/start_erl.xml +++ b/erts/doc/src/start_erl.xml @@ -69,12 +69,29 @@ program. Everything after is interpreted as options to itself. -reldir <release root> - Mandatory if the environment variable is not - specified. Tells start_erl where the root of the - release tree is placed in the file-system - (like <Erlang root>\\releases). The - file is expected to be placed in - this directory (if not otherwise specified). + + Mandatory if the environment variable + is not specified and no + -rootdir option is given. Tells start_erl where the + root of the release tree is placed in the file-system (typically + <Erlang root>\\releases). The + file is expected to be + placed in this directory (if not otherwise specified). If + only the -rootdir option is given, the directory is + assumed to be <Erlang root>\\releases. + + -rootdir <Erlang root directory> + + Mandatory if -reldir is not given and there is + no in the environment. This + specifies the Erlang installation root directory (under + which the lib, releases and + erts-<Version> directories are placed). If only + -reldir (or the environment variable + ) is given, the Erlang root is assumed to + be the directory exactly one level above the release + directory. + -data <data file name> Optional, specifies another data file than start_erl.data in the <release root>. It is specified relative to the -- cgit v1.2.3 From 9df8a8c8ff47f69594add5ae91f76b1acf27f7fe Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Tue, 7 Jun 2011 17:21:55 +0200 Subject: Spelling correction in erlsrv doc --- erts/doc/src/erlsrv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'erts/doc') diff --git a/erts/doc/src/erlsrv.xml b/erts/doc/src/erlsrv.xml index d9f7fdd309..919caa9542 100644 --- a/erts/doc/src/erlsrv.xml +++ b/erts/doc/src/erlsrv.xml @@ -290,10 +290,10 @@

The start_disabled command operates on a service regardless of if it's enabled/disabled or started/stopped. It - does this by first enabling it (regardless of if it' enabled + does this by first enabling it (regardless of if it's enabled or not), then starting it (if it's not already started) and then disabling it. The result will be a disabled but started - service, regardless of it's earlier state. This is useful for + service, regardless of its earlier state. This is useful for starting services temporarily during a release upgrade. The difference between using start_disabled and the sequence enable, start and disable is -- 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 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'erts/doc') 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:

+

+ 

+> Size1 = byte_size(term_to_binary(Term)),
+> Size2 = erlang:external_size(Term),
+> true = Size1 =< Size2.
+true
+
+

+

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:

+

+ 

+> Size1 = byte_size(term_to_binary(Term, Options)),
+> Size2 = erlang:external_size(Term, Options),
+> true = Size1 =< Size2.
+true
+
+

+

The option {minor_version, Version} specifies how floats + are encoded. See + term_to_binary/2 for + a more detailed description. +

+ + float(Number) -> float() Convert a number to a float -- cgit v1.2.3