jemalloc_analyse: Add support for 5.1.0

Jemalloc 5(.1.0) has changed the ouput format, adding some new columns
(currently ignored by this script) and renaming others.

Add aliases for the renamed columns so we can still calculate
fragmentation.

Change-Id: I9d52a9ccae877684f3e21671c4c2ff9adb5591a4
Reviewed-on: http://review.couchbase.org/112589
Tested-by: Build Bot <[email protected]>
Reviewed-by: James Harrison <[email protected]>

Author: daverigby

scripts/jemalloc/jemalloc_analyse.py

@@ -74,6 +74,11 @@ def calc_bin_stats(stats, arena_ID):
                   for x in line.split()]
         c = dict(zip(headers, fields))
 
+        # jemalloc 5.0.0 onwards renames `runs` to `slabs` for small
+        # allocations. Copy back to the old name to allow calculations to work.
+        if 'curslabs' in c:
+            c['curruns'] = c['curslabs']
+
         # Derive some stats from each class, additional ones (see below) need
         # totals...
         try:
@@ -107,6 +112,12 @@ def calc_bin_stats(stats, arena_ID):
             fields = [int(x) for x in line.split()]
             c = dict(zip(headers, fields))
 
+            # jemalloc 5.0.0 onwards renames `curruns` to `l(large)extents` for
+            # large allocations. Copy back to the old name to allow
+            # calculations to work.
+            if 'curlextents' in c:
+                c['curruns'] = c['curlextents']
+
             c['bin'] = '-'
             c['regs'] = 1  # Only one region per large allocation
             c['pgs'] = c['pages'] if 'pages' in c else c['size']//4096

tests/scripts_tests/runtests.cmake

@@ -10,7 +10,7 @@ IF("${COUCHBASE_MEMORY_ALLOCATOR}" STREQUAL "jemalloc")
         )
 ENDIF()
 
-FOREACH(version 3.6 3.6_cropped 4.3.1 current)
+FOREACH(version 3.6 3.6_cropped 4.3.1 5.1.0 current)
         SET(INPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/jemalloc_${version}.log)
         SET(OUTPUT_FILE
                 ${CMAKE_CURRENT_BINARY_DIR}/jemalloc_output_${version}.log)