From 61b1feed86ccf574613b913c5eea57d138eeb178 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Mon, 7 Jun 2010 12:00:00 +0200 Subject: megaco: Patch 1123 OTP-8561 A minor compiler related performance improvement. OTP-8529 A raise condition when, during high load, processing both the original and a resent message and delivering this as two separate messages to the user. Note that this solution only protects against multiple reply deliveries! OTP-8627 Fix shared libraries installation. The flex shared lib(s) were incorrectly installed as data files. OTP-8634 Eliminated a possible raise condition while creating pending counters. --- lib/megaco/doc/src/megaco.xml | 16 ++++++++-- lib/megaco/doc/src/megaco_mib.xml | 12 +++---- lib/megaco/doc/src/megaco_run.xml | 8 ++--- lib/megaco/doc/src/megaco_user.xml | 11 ++++--- lib/megaco/doc/src/notes.xml | 62 ++++++++++++++++++++++++++++++++++++ lib/megaco/doc/src/notes_history.xml | 10 +++--- 6 files changed, 96 insertions(+), 23 deletions(-) (limited to 'lib/megaco/doc/src') diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml index 0fb9d5aac6..ae9e250965 100644 --- a/lib/megaco/doc/src/megaco.xml +++ b/lib/megaco/doc/src/megaco.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + megaco @@ -40,6 +40,16 @@
DATA TYPES
- 20022009 + 20022010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Megaco mib @@ -50,15 +50,15 @@ lightweight. I.e. the statistic counters are handled separately by different entities of the application. For instance our two transport module(s) (see megaco_tcp and megaco_udp) maintain their - own counters and the application engine (see megaco) maintain it's own + own counters and the application engine (see megaco) maintain its own counters.

This also means that if a user implement their own transport - service then it has to maintain it's own statistics.

+ service then it has to maintain its own statistics.

Distribution -

Each megaco application maintains it's own set of counters. So +

Each megaco application maintains its own set of counters. So in a large (distributed) MG/MGC it could be necessary to collect the statistics from several nodes (each) running the megaco application (only one of them with the transport).

diff --git a/lib/megaco/doc/src/megaco_run.xml b/lib/megaco/doc/src/megaco_run.xml index 3afc638bcf..9ed589b079 100644 --- a/lib/megaco/doc/src/megaco_run.xml +++ b/lib/megaco/doc/src/megaco_run.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Running the stack @@ -365,7 +365,7 @@ then the specified max message size (see the max_pdu_size option). Finally, if segmentation is decided, then each action reply - will make up it's own (segment) message.

+ will make up its own (segment) message.

diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml index 37942007bc..7332fa684d 100644 --- a/lib/megaco/doc/src/megaco_user.xml +++ b/lib/megaco/doc/src/megaco_user.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + megaco_user @@ -471,7 +471,7 @@ protocol_version() = integer() ]]> transaction_result() = action_reps() segment_result() = {segment_no(), last_segment(), action_reps()} action_reps() = [action_reply()] - failure() = {error, reason()} + failure() = {error, reason()} | {error, ReplyNo, reason()} reason() = transaction_reason() | segment_reason() | user_cancel_reason() | send_reason() | other_reason() transaction_reason() = error_desc() segment_reason() = {segment_no(), last_segment(), error_desc()} @@ -486,6 +486,7 @@ protocol_version() = integer() ]]> send_failed_reason() = {send_message_failed, reason_for_send_failure()} reason_for_send_failure() = term() ReplyData = reply_data() + ReplyNo = integer() > 0 reply_data() = term() Extra = term() @@ -669,7 +670,7 @@ protocol_version() = integer() ]]>

Invoked when a unexpected message is received

If a reply to a request is not received in time, the megaco stack removes all info about the request from - it's tables. If a reply should arrive after this has been + its tables. If a reply should arrive after this has been done the app has no way of knowing where to send this message. The message is delivered to the "user" by calling this function on the local node (the node which has the link).

diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index 65bf0345f5..99a3784402 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -35,6 +35,68 @@ thus constitutes one section in this document. The title of each section is the version number of Megaco.

+
+ Megaco 3.14.1 + +

Version 3.14.1 supports code replacement in runtime from/to + version 3.14, 3.13, 3.12 and 3.11.3.

+ +
+ Improvements and new features + + + + + +

A minor compiler related performance improvement.

+

Own Id: OTP-8561

+ + + + +
+ +
+ Fixed bugs and malfunctions + + + + +

A raise condition when, during high load, processing + both the original and a resent message and delivering + this as two separate messages to the user.

+

Note that this solution only protects against multiple + reply deliveries!

+

Own Id: OTP-8529

+

Aux Id: Seq 10915

+ + + +

Fix shared libraries installation.

+

The flex shared lib(s) were incorrectly installed as data + files.

+

Peter Lemenkov

+

Own Id: OTP-8627

+ + + +

Eliminated a possible raise condition while creating + pending counters.

+

Own Id: OTP-8634

+

Aux Id: Seq 11579

+ + + + +
+ +
+ +
Megaco 3.14 diff --git a/lib/megaco/doc/src/notes_history.xml b/lib/megaco/doc/src/notes_history.xml index 97aa4c66a5..640b62230f 100644 --- a/lib/megaco/doc/src/notes_history.xml +++ b/lib/megaco/doc/src/notes_history.xml @@ -4,7 +4,7 @@
- 20062009 + 20062010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Megaco Release Notes history @@ -2764,7 +2764,7 @@

Added a new configuration parameter, threaded. This tells the megaco app, that all transaction requests in a message should be executed - in parallel (e.g. each in it's own process). + in parallel (e.g. each in its own process).

See the threaded parameter of the user_info function (also conn_info).

@@ -2911,7 +2911,7 @@ Improvements and new features -

This is just a code up-/downgrade cleanup release. I.e. It's the +

This is just a code up-/downgrade cleanup release. I.e. it's the same as version 1.2 minus the ugly stuff needed to handle up-/downgrade from/to version 1.1.2, 1.1.1 and 1.1.0.

 -- cgit v1.2.3