Merge pull request #3 from michep/patch

One map with all patterms

Author: casastorta

sar/__init__.py

@@ -1,18 +1,6 @@
 #!/usr/bin/env python
 
 
-"""Indicates CPU part of SAR file"""
-PART_CPU = 0
-
-"""Indicates RAM memory usage part of SAR file"""
-PART_MEM = 1
-
-"""Indicates swap memory usage part of SAR file"""
-PART_SWP = 2
-
-"""I/O usage part of SAR file"""
-PART_IO = 3
-
 """CPU regexp pattern for detecting SAR section header"""
 PATTERN_CPU = ".*CPU.*(usr|user).*nice.*sys.*"
 
@@ -28,7 +16,7 @@
 }
 
 """Mem usage regexp pattern for detecting SAR section header"""
-PATTERN_MEM = ".*kbmemfree.*kbmemused.*memused.*kbbuffers.*kbcached.*"
+PATTERN_MEM = '.*kbmemfree.*kbmemused.*memused.*kbbuffers.*kbcached.*'
 
 """Regexp terms for finding fields in SAR parts for memory usage"""
 FIELDS_MEM = [
@@ -43,7 +31,7 @@
 }
 
 """Swap usage regexp pattern for detecting SAR section header"""
-PATTERN_SWP = ".*kbswpfree.*kbswpused.*swpused.*"
+PATTERN_SWP = '.*kbswpfree.*kbswpused.*swpused.*'
 
 """Regexp terms for finding fields in SAR parts for swap usage"""
 FIELDS_SWP = [
@@ -57,31 +45,71 @@
 }
 
 """I/O usage regexp pattern for detecting SAR section header"""
-PATTERN_IO = ".*tps.*rtps.*wtps.*bread\/s.*bwrtn\/s.*"
+PATTERN_IO = '.*tps.*rtps.*wtps.*bread\/s.*bwrtn\/s.*'
 
-"""Regexp terms for finding fields in SAR parts for swap usage"""
+"""Regexp terms for finding fields in SAR parts for I/O usage"""
 FIELDS_IO = [
     '^tps', '^rtps', '^wtps', 'bread\/s', 'bwrtn\/s'
 ]
 
-"""Pair regexp terms with field names in swap usage output dictionary"""
+"""Pair regexp terms with field names in I/O usage output dictionary"""
 FIELD_PAIRS_IO = {
     'tps': FIELDS_IO[0], 'rtps': FIELDS_IO[1], 'wtps': FIELDS_IO[2],
     'bread': FIELDS_IO[3], 'bwrite': FIELDS_IO[4],
+}
+
+"""Task creation and system switching regexp pattern for SAR section header"""
+PATTERN_TASK = '.*proc\/s.*cswch\/s.*'
 
+"""Regexp terms for finding fields in SAR parts for task creation and system switching"""
+FIELDS_TASK = [
+    'proc', 'cswch'
+]
+
+"""Pair regexp terms with field names in Task creation and system switching output dictionary"""
+FIELD_PAIRS_TASK = {
+    'proc': FIELDS_TASK[0], 'cswch': FIELDS_TASK[1]
 }
 
 """Restart time regexp pattern for detecting SAR restart notices"""
-PATTERN_RESTART = ".*LINUX\ RESTART.*"
+PATTERN_RESTART = '.*LINUX\ RESTART.*'
 
 """Pattern for splitting multiple combined SAR file"""
-PATTERN_MULTISPLIT = "Linux"
+PATTERN_MULTISPLIT = 'Linux'
 
 """Split by date in multiday SAR file"""
-PATTERN_DATE = "[0-9][0-9][0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]"
+PATTERN_DATE = '[0-9][0-9][0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]'
+
+ALL_PATTERNS = {
+    'CPU': {
+        'PATTERN': PATTERN_CPU,
+        'FIELDS': FIELDS_CPU,
+        'PAIRS': FIELD_PAIRS_CPU
+    },
+    'MEM': {
+        'PATTERN': PATTERN_MEM,
+        'FIELDS': FIELDS_MEM,
+        'PAIRS': FIELD_PAIRS_MEM
+    },
+    'SWP': {
+        'PATTERN': PATTERN_SWP,
+        'FIELDS': FIELDS_SWP,
+        'PAIRS': FIELD_PAIRS_SWP
+    },
+    'IO': {
+        'PATTERN': PATTERN_IO,
+        'FIELDS': FIELDS_IO,
+        'PAIRS': FIELD_PAIRS_IO
+    },
+    'TASK': {
+        'PATTERN': PATTERN_TASK,
+        'FIELDS': FIELDS_TASK,
+        'PAIRS': FIELD_PAIRS_TASK
+
+    }
+}
 
 __all__ = [
-    "PART_CPU", "PART_MEM", "PART_SWP", "PART_IO",
-    "PATTERN_CPU", "PATTERN_MEM", "PATTERN_SWP", "PATTERN_IO",
-    "PATTERN_RESTART", "PATTERN_MULTISPLIT", "PATTERN_DATE"
+    'PATTERN_RESTART', 'PATTERN_MULTISPLIT',
+    'PATTERN_DATE', 'ALL_PATTERNS'
 ]