pybootchartgui: make meminfo parsing faster

Using a stricter regexp lets us filter early only the data we
actually need. Doing meminfo parsing now takes ~50% less time.

Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py
index b7b2546ff1c8e52d06b4465cf20fa9d74fa75cfa..6e139bfbd1650279657409a78751c0f383891f43 100644 (file)
--- a/scripts/pybootchartgui/pybootchartgui/parsing.py
+++ b/scripts/pybootchartgui/pybootchartgui/parsing.py
@@ -514,7 +514,7 @@ def _parse_proc_meminfo_log(file):
     The format of relevant lines should be: ^key: value( unit)?
     """
     mem_stats = []
-    meminfo_re = re.compile(r'([^ \t:]+):\s*(\d+).*')
+    meminfo_re = re.compile(r'(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+).*')
 
     for time, lines in _parse_timed_blocks(file):
         sample = MemSample(time)

diff --git a/scripts/pybootchartgui/pybootchartgui/samples.py b/scripts/pybootchartgui/pybootchartgui/samples.py
index 9fc309b3abf76bb312f1a53fb47593e0a9e68ade..89798682d574c9581256446ed6282814d0f4fd45 100644 (file)
--- a/scripts/pybootchartgui/pybootchartgui/samples.py
+++ b/scripts/pybootchartgui/pybootchartgui/samples.py
@@ -45,8 +45,7 @@ class MemSample:
         self.records = {}
 
     def add_value(self, name, value):
-        if name in MemSample.used_values:
-            self.records[name] = value
+        self.records[name] = value
 
     def valid(self):
         keys = self.records.keys()