sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-03 11:52:36 +01:00
Code Issues Releases Wiki Activity

wa/types: Add cpu_mask type

Browse Source 
Add a cpu_mask type to allow for users to use a consistent way of representing a
cpus mask with properties to provide conversions between the various required
forms. The mask can be specified directly as a mask, as a list of cpus indexes
or a sysfs-style string.
Also add support for the type to be serialized/deserialzed for the json
and yaml serializers.
This commit is contained in:
Marc Bonnici
2018-05-11 10:15:57 +01:00
committed by setrofim
parent a2b0705ff0
commit 670fe6fb83
2 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wa/utils/serializer.py
View File

@@ -52,7 +52,7 @@ import dateutil.parser
from wa.framework.exception import SerializerSyntaxError
from wa.utils.misc import isiterable
from wa.utils.types import regex_type, none_type, level
from wa.utils.types import regex_type, none_type, level, cpu_mask
__all__ = [
@@ -91,6 +91,8 @@ class WAJSONEncoder(_json.JSONEncoder):
return 'DATET:{}'.format(obj.isoformat())
elif isinstance(obj, level):
return 'LEVEL:{}:{}'.format(obj.name, obj.value)
elif isinstance(obj, cpu_mask):
return 'CPUMASK:{}'.format(obj.mask())
else:
return _json.JSONEncoder.default(self, obj)
@@ -111,6 +113,9 @@ class WAJSONDecoder(_json.JSONDecoder):
elif v.startswith('LEVEL:'):
_, name, value = v.split(':', 2)
return level(name, value)
elif v.startswith('CPUMASK:'):
_, value = v.split(':', 1)
return cpu_mask(value)
return v
@@ -156,6 +161,7 @@ class json(object):
_mapping_tag = _yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG
_regex_tag = u'tag:wa:regex'
_level_tag = u'tag:wa:level'
_cpu_mask_tag = u'tag:wa:cpu_mask'
def _wa_dict_representer(dumper, data):
@@ -170,6 +176,9 @@ def _wa_level_representer(dumper, data):
text = '{}:{}'.format(data.name, data.level)
return dumper.represent_scalar(_level_tag, text)
def _wa_cpu_mask_representer(dumper, data):
return dumper.represent_scalar(_cpu_mask_tag, data.mask())
def _wa_dict_constructor(loader, node):
pairs = loader.construct_pairs(node)
seen_keys = set()
@@ -190,13 +199,19 @@ def _wa_level_constructor(loader, node):
name, value = value.split(':', 1)
return level(name, value)
def _wa_cpu_mask_constructor(loader, node):
value = loader.construct_scalar(node)
return cpu_mask(value)
_yaml.add_representer(OrderedDict, _wa_dict_representer)
_yaml.add_representer(regex_type, _wa_regex_representer)
_yaml.add_representer(level, _wa_level_representer)
_yaml.add_representer(cpu_mask, _wa_cpu_mask_representer)
_yaml.add_constructor(_mapping_tag, _wa_dict_constructor)
_yaml.add_constructor(_regex_tag, _wa_regex_constructor)
_yaml.add_constructor(_level_tag, _wa_level_constructor)
_yaml.add_constructor(_cpu_mask_tag, _wa_cpu_mask_constructor)
class yaml(object):