aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/efficiency_guide
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-09-04 16:59:41 +0200
committerSverker Eriksson <[email protected]>2014-09-04 16:59:41 +0200
commit267cf6cd5ba5e4392718c3c6f7f6467ac01ea2b0 (patch)
tree97f285eeac2f25d9563d4082c15020be9b90f1e2 /system/doc/efficiency_guide
parente036643fbd5c5cba7f652734966570fee7ca99b3 (diff)
parentb182aa2cfab793e566c92183c361e78f4d6f84cb (diff)
downloadotp-267cf6cd5ba5e4392718c3c6f7f6467ac01ea2b0.tar.gz
otp-267cf6cd5ba5e4392718c3c6f7f6467ac01ea2b0.tar.bz2
otp-267cf6cd5ba5e4392718c3c6f7f6467ac01ea2b0.zip
Merge branch 'sverk/nif-inspect-copy-bug/OTP-9828' into maint
* sverk/nif-inspect-copy-bug/OTP-9828: erts: Fix bug with enif_make_copy reallocating writable binary Conflicts: erts/emulator/test/nif_SUITE.erl
Diffstat (limited to 'system/doc/efficiency_guide')
-rw-r--r--system/doc/efficiency_guide/binaryhandling.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/doc/efficiency_guide/binaryhandling.xml b/system/doc/efficiency_guide/binaryhandling.xml
index 6b0df49011..4ba1378059 100644
--- a/system/doc/efficiency_guide/binaryhandling.xml
+++ b/system/doc/efficiency_guide/binaryhandling.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2007</year>
- <year>2013</year>
+ <year>2014</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -237,8 +237,9 @@ Bin = <<Bin1,...>> %% Bin1 will be COPIED
<p><c>Bin1</c> will be copied in the third line.</p>
<p>The same thing happens if you insert a binary into an <em>ets</em>
- table or send it to a port using <c>erlang:port_command/2</c>.</p>
-
+ table or send it to a port using <c>erlang:port_command/2</c> or pass it to
+ <seealso marker="erts:erl_nif#enif_inspect_binary">enif_inspect_binary</seealso>
+ in a NIF.</p>
<p>Matching a binary will also cause it to shrink and the next append
operation will copy the binary data:</p>