niklas/tracetools_analysis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linter errors

Browse source
This commit is contained in:
Christophe Bedard 2019-12-29 11:35:07 -05:00
parent bd37b4aa0f
commit 1e83053cc1
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tracetools_analysis/tracetools_analysis/scripts/memory_usage.py
View file

@ -14,8 +14,6 @@
import sys import sys
import pandas as pd
from tracetools_analysis.loading import load_file from tracetools_analysis.loading import load_file
from tracetools_analysis.processor import Processor from tracetools_analysis.processor import Processor
from tracetools_analysis.processor.memory_usage import KernelMemoryUsageHandler from tracetools_analysis.processor.memory_usage import KernelMemoryUsageHandler

10
tracetools_analysis/tracetools_analysis/utils/memory_usage.py
View file

@ -35,7 +35,7 @@ class MemoryUsageDataModelUtil(DataModelUtil):
""" """
Create a MemoryUsageDataModelUtil. Create a MemoryUsageDataModelUtil.
At least one non-`None` `MemoryUsageDataModel` must be given At least one non-`None` `MemoryUsageDataModel` must be given.
:param userspace: the userspace data model object to use :param userspace: the userspace data model object to use
:param kernel: the kernel data model object to use :param kernel: the kernel data model object to use
@ -80,15 +80,17 @@ class MemoryUsageDataModelUtil(DataModelUtil):
if self.data_kernel is not None: if self.data_kernel is not None:
kernel_memory_usage_dfs = self.get_absolute_kernel_memory_usage_by_tid() kernel_memory_usage_dfs = self.get_absolute_kernel_memory_usage_by_tid()
tids_kernel = set(kernel_memory_usage_dfs.keys()) tids_kernel = set(kernel_memory_usage_dfs.keys())
# Use only the userspace tid values if they're available, otherwise use the kernel tid valus # Use only the userspace tid values if available, otherwise use the kernel tid values
tids = tids_ust if self.data_ust is not None else tids_kernel tids = tids_ust if self.data_ust is not None else tids_kernel
data = [ data = [
[ [
tid, tid,
self.format_size(ust_memory_usage_dfs[tid]['memory_usage'].max(), precision=1) self.format_size(ust_memory_usage_dfs[tid]['memory_usage'].max(), precision=1)
if self.data_ust is not None else None, if self.data_ust is not None
else None,
self.format_size(kernel_memory_usage_dfs[tid]['memory_usage'].max(), precision=1) self.format_size(kernel_memory_usage_dfs[tid]['memory_usage'].max(), precision=1)
if self.data_kernel is not None and ust_memory_usage_dfs.get(tid) is not None else None, if self.data_kernel is not None and ust_memory_usage_dfs.get(tid) is not None
else None,
] ]
for tid in tids for tid in tids
] ]