diff --git a/OOMAnalyser.py b/OOMAnalyser.py index 798405c..7c0bb3d 100644 --- a/OOMAnalyser.py +++ b/OOMAnalyser.py @@ -293,12 +293,13 @@ class BaseKernelConfig: True, ), "Overall Mem-Info (part 2)": ( - r"^ slab_reclaimable:(?P\d+) slab_unreclaimable:(?P\d+)" + r"slab_reclaimable:(?P\d+) slab_unreclaimable:(?P\d+)" r"(?:\n)" - r"^ mapped:(?P\d+) shmem:(?P\d+) pagetables:(?P\d+) " - r"bounce:(?P\d+)" + r" +mapped:(?P\d+) shmem:(?P\d+) pagetables:(?P\d+) bounce:(?P\d+)" r"(?:\n)" - r"^ free:(?P\d+) free_pcp:(?P\d+) free_cma:(?P\d+)", + r" +kernel_misc_reclaimable:(?P\d+)" + r"(?:\n)" + r" +free:(?P\d+) free_pcp:(?P\d+) free_cma:(?P\d+)", True, ), "Available memory chunks": ( @@ -2583,15 +2584,13 @@ class KernelConfig_6_1(KernelConfig_6_0): EXTRACT_PATTERN_OVERLAY_61 = { "Overall Mem-Info (part 2)": ( - r"^ slab_reclaimable:(?P\d+) slab_unreclaimable:(?P\d+)" + r" +slab_reclaimable:(?P\d+) slab_unreclaimable:(?P\d+)" r"(?:\n)" - r"^ mapped:(?P\d+) shmem:(?P\d+) pagetables:(?P\d+)" + r" +mapped:(?P\d+) shmem:(?P\d+) pagetables:(?P\d+) bounce:(?P\d+)" r"(?:\n)" - r"^ sec_pagetables:(?P\d+) bounce:(?P\d+)" + r" +kernel_misc_reclaimable:(?P\d+)" r"(?:\n)" - r"^ kernel_misc_reclaimable:(?P\d+)" - r"(?:\n)" - r"^ free:(?P\d+) free_pcp:(?P\d+) free_cma:(?P\d+)", + r" +free:(?P\d+) free_pcp:(?P\d+) free_cma:(?P\d+)", True, ), }