Merge branch 'rickard/proc-sched/OTP-9892'

* rickard/proc-sched/OTP-9892:
  Teach etp-commands to understand new emulator internal data structures
  Optimize process state changes
  Optimize process table access
  Implement possibility to use ordinary mutexes as process locks

Conflicts:
	erts/emulator/beam/erl_alloc.types

1 files changed, 41 insertions, 2 deletions

diff --git a/erts/emulator/beam/erl_node_container_utils.h b/erts/emulator/beam/erl_node_container_utils.h
index 329a2204cc..7b4cb7b042 100644
--- a/erts/emulator/beam/erl_node_container_utils.h
+++ b/erts/emulator/beam/erl_node_container_utils.h
@@ -128,8 +128,47 @@ extern int erts_use_r9_pids_ports;
  * Pids                                                                    *
 \*                                                                         */
 
-#define internal_pid_index(x)		(internal_pid_data((x))	\
-					 & erts_process_tab_index_mask)
+#define erts_max_processes erts_proc.max
+
+typedef struct {
+    erts_smp_atomic_t *tab;
+    int max;
+    int tab_cache_lines;
+    int pix_per_cache_line;
+    int pix_cl_mask;
+    int pix_cl_shift;
+    int pix_cli_mask;
+    int pix_cli_shift;
+} ErtsProcTab;
+
+extern ErtsProcTab erts_proc;
+
+ERTS_GLB_INLINE int erts_pid_data2ix(Eterm pid_data);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE int erts_pid_data2ix(Eterm pid_data)
+{
+    int n, pix;
+
+    n = (int) pid_data;
+    if (erts_proc.pix_cl_mask) {
+	pix = ((n & erts_proc.pix_cl_mask) << erts_proc.pix_cl_shift);
+	pix += ((n >> erts_proc.pix_cli_shift) & erts_proc.pix_cli_mask);
+    }
+    else {
+	n %= erts_proc.max;
+	pix = n % erts_proc.tab_cache_lines;
+	pix *= erts_proc.pix_per_cache_line;
+	pix += n / erts_proc.tab_cache_lines;
+    }
+    ASSERT(0 <= pix && pix < erts_proc.max);
+    return pix;
+}
+
+#endif
+
+#define internal_pid_index(x)		erts_pid_data2ix(internal_pid_data((x)))
 
 #define internal_pid_node_name(x)	(internal_pid_node((x))->sysname)
 #define external_pid_node_name(x)	(external_pid_node((x))->sysname)