From 3aa7023f2e4f5454faddd663f00ee4c935f9b8f6 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 4 Dec 2014 11:09:28 +0100
Subject: ets: Increase data available in crash dumps and ets:info

OTP-12376
---
 lib/stdlib/doc/src/ets.xml | 6 ++++++
 lib/stdlib/src/ets.erl     | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 3df24bf688..aa16e4e3db 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -456,6 +456,12 @@ Error: fun containing local Erlang function calls
           <item><c>{type, <seealso marker="#type-type">type()</seealso>}</c>          <br></br>
 
            The table type.</item>
+          <item><c>{read_concurrency, boolean()}</c>          <br></br>
+
+           Indicates whether the table uses read_concurrency or not.</item>
+          <item><c>{write_concurrency, boolean()}</c>          <br></br>
+
+           Indicates whether the table uses write_concurrency or not.</item>
         </list>
       </desc>
     </func>
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 42b11a97e2..d3a6a21416 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -133,7 +133,9 @@ give_away(_, _, _) ->
                  | {owner, pid()}
                  | {protection, access()}
                  | {size, non_neg_integer()}
-                 | {type, type()}.
+                 | {type, type()}
+		 | {write_concurrency, boolean()}
+		 | {read_concurrency, boolean()}.
 
 info(_) ->
     erlang:nif_error(undef).
@@ -142,7 +144,8 @@ info(_) ->
       Tab :: tab(),
       Item :: compressed | fixed | heir | keypos | memory
             | name | named_table | node | owner | protection
-            | safe_fixed | size | stats | type,
+            | safe_fixed | size | stats | type
+	    | write_concurrency | read_concurrency,
       Value :: term().
 
 info(_, _) ->
-- 
cgit v1.2.3