aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/doc/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-08-02 11:52:53 +0200
committerLukas Larsson <[email protected]>2011-08-02 11:52:53 +0200
commitb16af6d09ef2a5843e1fb491114906780f3f970d (patch)
tree484e6102aedf6a70ed8523ad59a7a29478b48c44 /lib/asn1/doc/src
parent97f867992aaf98eac44c8fcd17df3a15e4aa3eab (diff)
parentf2490767798cbc3ea94d603afb75be2eb65fe564 (diff)
downloadotp-b16af6d09ef2a5843e1fb491114906780f3f970d.tar.gz
otp-b16af6d09ef2a5843e1fb491114906780f3f970d.tar.bz2
otp-b16af6d09ef2a5843e1fb491114906780f3f970d.zip
Merge branch 'lukas/asn1/ber_encode_nif/OTP-9441' into major
* lukas/asn1/ber_encode_nif/OTP-9441: Update to use enif_alloc instead of malloc Make performance code more generic and migrate per/ber NBAP perormance suites to use the generic code Update code genaration to call nif/erlang depending on what is configured Remove export_all and only export is_nif_loadable Add documentation for ber encode nif optmization Fix bug in counting length of empty composite types Fix bug where composite types with more then one element would be encoded in reverse Add pubkey performance tests Update ber encode nif to use a linked list memry buffer Create a nif for ber encode Extract generic is_nif_loadable function from decode
Diffstat (limited to 'lib/asn1/doc/src')
-rw-r--r--lib/asn1/doc/src/asn1_ug.xml4
-rw-r--r--lib/asn1/doc/src/asn1ct.xml10
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 61e4f6062f..1b399fb641 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -369,7 +369,7 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
<item>
<p>Together with the flags <c>ber_bin</c>
and <c>optimize</c> you choose to use a nif for considerable
- faster decode. </p>
+ faster encode and decode. </p>
</item>
<tag><c>+asn1config</c></tag>
<item>
@@ -631,7 +631,7 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes). </pre>
</table>
<p>
- The sole compile options <c>ber</c>, <c>ber_bin</c>, <c>per</c> and
+ The compile options <c>ber</c>, <c>per</c> and
<c>driver</c> are kept for backwards compatibility and should not be
used in new code. The nif implementation which replaces the linked-in
driver has been shown to be about 5-15% faster.
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index d7c2572dc8..13e6977419 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -225,8 +225,8 @@ Binary = binary()
<item>
<p>Option valid together with <c>ber_bin</c> and <c>optimize</c>
options. It enables the use of several nifs that gives faster
- decode. Nifs are only enabled by the explicit use of the option
- <c>nif</c></p>
+ encode and decode. Nifs are only enabled by the explicit use of
+ the option <c>nif</c></p>
</item>
<tag><c>asn1config</c></tag>
<item>
@@ -269,7 +269,11 @@ Binary = binary()
<c>.set.asn</c> are exported, unless a
<c>{export,[atom()]}</c> or <c>{export_all,true}</c> option
are provided. The list of atoms are names of chosen asn1
- specs from the <c>.set.asn</c> file.</p>
+ specs from the <c>.set.asn</c> file. </p>
+ <p>When used together with <c>nif</c> for <c>ber_bin</c>, the
+ asn1 nifs will be used if the <c>asn1rt_nif</c> module is
+ available. If it is not available, a slower erlang fallback
+ will be used.</p>
</item>
<tag><c>inline</c></tag>
<item>