Merge branch 'maint'

* maint:
  Introduce a better id allocation algorithm for PTabs

1 files changed, 10 insertions, 8 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 9de4ef1ff9..403776aade 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2176,7 +2176,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 
 
     if (want_tot_or_sys || want.processes || want.processes_used) {
-	int max_processes = erts_ptab_max(&erts_proc);
 	UWord tmp;
 
 	if (ERTS_MEM_NEED_ALL_ALCU)
@@ -2186,7 +2185,7 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		      fi, ERTS_ALC_NO_FIXED_SIZES);
 	    tmp = alcu_size(ERTS_ALC_A_EHEAP, NULL, 0);
 	}
-	tmp += max_processes*sizeof(erts_smp_atomic_t);
+	tmp += erts_ptab_mem_size(&erts_proc);
 	tmp += erts_bif_timer_memory_size();
 	tmp += erts_tot_link_lh_size();
 
@@ -2312,13 +2311,11 @@ struct aa_values {
 Eterm
 erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 {
-#define MAX_AA_VALUES (23)
+#define MAX_AA_VALUES (24)
     struct aa_values values[MAX_AA_VALUES];
     Eterm res = THE_NON_VALUE;
     int i, length;
     Uint reserved_atom_space, atom_space;
-    int max_processes = erts_ptab_max(&erts_proc);
-    int max_ports = erts_ptab_max(&erts_port);
 
     if (proc) {
 	ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN
@@ -2349,8 +2346,8 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 
     values[i].arity = 2;
     values[i].name = "static";
-    values[i].ui[0] = 
-	max_ports*sizeof(erts_smp_atomic_t)	/* Port table */
+    values[i].ui[0] =
+	sizeof(ErtsPTab)*2			/* proc & port tables */
 	+ erts_timer_wheel_memory_size();	/* Timer wheel */
     i++;
 
@@ -2429,7 +2426,12 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 
     values[i].arity = 2;
     values[i].name = "process_table";
-    values[i].ui[0] = max_processes*sizeof(Process*);
+    values[i].ui[0] = erts_ptab_mem_size(&erts_proc);
+    i++;
+
+    values[i].arity = 2;
+    values[i].name = "port_table";
+    values[i].ui[0] = erts_ptab_mem_size(&erts_port);
     i++;
 
     values[i].arity = 2;