Merge branch 'egil/lcnt' into ccase/r13b04_dev

* egil/lcnt:
  Add test suite for lcnt in tools
  Add lcnt:rt_opt/1 bindings to erts_debug
  Add runtime option to enable/disable lcnt stats
  Add auto width on string output
  Add lcnt documentation
  Add lock profiling tool

OTP-8424  Add lock profiling tool.

          The Lock profiling tool, lcnt, can make use of the internal lock
          statistics when the runtime system is built with this feature
          enabled.

          This provides a mechanism to examine potential lock bottlenecks
          within the runtime itself.

          - Add erts_debug:lock_counters({copy_save, bool()}). This option
          enables or disables statistics saving for destroyed processes and
          ets-tables. Enabling this might consume a lot of memory.

          - Add id-numbering for lock classes which is otherwise undefined.

1 files changed, 20 insertions, 5 deletions

diff --git a/erts/emulator/beam/erl_lock_count.h b/erts/emulator/beam/erl_lock_count.h
index 8564c36203..e3044c371f 100644
--- a/erts/emulator/beam/erl_lock_count.h
+++ b/erts/emulator/beam/erl_lock_count.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * 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.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -39,6 +39,20 @@
  * 	Each instance of a lock is the unique lock, i.e. set and id in that set.
  * 	For each lock there is a set of statistics with where and what impact
  * 	the lock aqusition had.
+ *
+ * 	Runtime options
+ * 	- suspend, used when internal lock-counting can't be applied. For instance
+ * 	  when allocating a term for the outside and halloc needs to be used.
+ * 	  Default: off.
+ * 	- location, reserved and not used.
+ * 	- proclock, disable proclock counting. Used when performance might be an
+ * 	  issue. Accessible from erts_debug:lock_counters({process_locks, bool()}).
+ * 	  Default: off.
+ * 	- copysave, enable saving of destroyed locks (and thereby its statistics).
+ * 	  If memory constraints is an issue this need to be disabled.
+ * 	  Accessible from erts_debug:lock_counters({copy_save, bool()}).
+ * 	  Default: off.
+ *
  */
 
 #include "sys.h"
@@ -74,6 +88,7 @@
 #define ERTS_LCNT_OPT_SUSPEND   (((Uint16) 1) << 0)
 #define ERTS_LCNT_OPT_LOCATION  (((Uint16) 1) << 1)
 #define ERTS_LCNT_OPT_PROCLOCK  (((Uint16) 1) << 2)
+#define ERTS_LCNT_OPT_COPYSAVE  (((Uint16) 1) << 3)
 
 typedef struct {
     unsigned long s;