ttop handles more files now (#63)

datastax-labs · May 19, 2021 · f2b6ae5 · f2b6ae5
1 parent 29c30e0
commit f2b6ae5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pysper/ttop.py b/pysper/ttop.py
@@ -51,7 +51,7 @@ class TTopParser:
     )
     # [001900] user= 4.87% sys= 5.52% alloc= 2172kb/s - RMI TCP Connection(184)-127.0.0.1
     tinfo_match = re.compile(
-        r" *\[(?P<thread_id>[0-9]+)\] user= *(?P<user_cpu>-?[0-9]+\.[0-9]+)% sys= *(?P<sys_cpu>-?[0-9]+\.[0-9]+)% alloc= *(?P<heap_rate>[0-9]+)(?P<heap_unit>[m|k]?b)/s - (?P<thread_name>.+)"
+        r" *\[(?P<thread_id>[0-9]+)\] user=\s*(?P<user_cpu>-?[0-9]+\.[0-9]+)% sys=\s*(?P<sys_cpu>-?[0-9]+\.[0-9]+)% alloc=\s*(?P<heap_rate>-?[0-9]+)(?P<heap_unit>(mb|kb|b|gb))/s - (?P<thread_name>.*)"
     )
 
     def __init__(self, start=None, end=None):
@@ -127,6 +127,7 @@ def parse(self, log):
                 else:
                     m = self.tinfo_match.match(line)
                     if not m:
+
                         raise ValueError("thread info not found in '" + line + "'")
                     threads[m.group("thread_name")]["user_cpu"] = float(
                         m.group("user_cpu")
@@ -165,6 +166,7 @@ def collate_threads(self, threads):
         exprs = []
         exprs.append(r":.*")
         exprs.append(r"-\d+.*")
+        exprs.append(r"- \d+.*")
         exprs.append(r"-\/.*")
         for thread in threads:
             name = thread