From e428a1c9f00cf867d62c8bc75f53d28061dc39ee Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sun, 16 Apr 2023 16:21:58 +0200
Subject: [PATCH] Update Mem-Info/Part2 regex

Update fields to match latest openSUSE output.
Use spaces instead of new lines to match what a user
would copy/paste from shell output.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 OOMAnalyser.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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<slab_reclaimable_pages>\d+) slab_unreclaimable:(?P<slab_unreclaimable_pages>\d+)"
+            r"slab_reclaimable:(?P<slab_reclaimable_pages>\d+) slab_unreclaimable:(?P<slab_unreclaimable_pages>\d+)"
             r"(?:\n)"
-            r"^ mapped:(?P<mapped_pages>\d+) shmem:(?P<shmem_pages>\d+) pagetables:(?P<pagetables_pages>\d+) "
-            r"bounce:(?P<bounce_pages>\d+)"
+            r" +mapped:(?P<mapped_pages>\d+) shmem:(?P<shmem_pages>\d+) pagetables:(?P<pagetables_pages>\d+) bounce:(?P<bounce_pages>\d+)"
             r"(?:\n)"
-            r"^ free:(?P<free_pages>\d+) free_pcp:(?P<free_pcp_pages>\d+) free_cma:(?P<free_cma_pages>\d+)",
+            r" +kernel_misc_reclaimable:(?P<kernel_misc_reclaimable>\d+)"
+            r"(?:\n)"
+            r" +free:(?P<free_pages>\d+) free_pcp:(?P<free_pcp_pages>\d+) free_cma:(?P<free_cma_pages>\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<slab_reclaimable_pages>\d+) slab_unreclaimable:(?P<slab_unreclaimable_pages>\d+)"
+            r" +slab_reclaimable:(?P<slab_reclaimable_pages>\d+) slab_unreclaimable:(?P<slab_unreclaimable_pages>\d+)"
             r"(?:\n)"
-            r"^ mapped:(?P<mapped_pages>\d+) shmem:(?P<shmem_pages>\d+) pagetables:(?P<pagetables_pages>\d+)"
+            r" +mapped:(?P<mapped_pages>\d+) shmem:(?P<shmem_pages>\d+) pagetables:(?P<pagetables_pages>\d+) bounce:(?P<bounce_pages>\d+)"
             r"(?:\n)"
-            r"^ sec_pagetables:(?P<sec_pagetables>\d+) bounce:(?P<bounce_pages>\d+)"
+            r" +kernel_misc_reclaimable:(?P<kernel_misc_reclaimable>\d+)"
             r"(?:\n)"
-            r"^ kernel_misc_reclaimable:(?P<kernel_misc_reclaimable>\d+)"
-            r"(?:\n)"
-            r"^ free:(?P<free_pages>\d+) free_pcp:(?P<free_pcp_pages>\d+) free_cma:(?P<free_cma_pages>\d+)",
+            r" +free:(?P<free_pages>\d+) free_pcp:(?P<free_pcp_pages>\d+) free_cma:(?P<free_cma_pages>\d+)",
             True,
         ),
     }