diff --git a/MANIFEST.in b/MANIFEST.in index 502fff4..3eed7d2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -recursive-include solox/public *.html *.js *.css *.png *.py .json +recursive-include solox/public *.html *.js *.css *.png *.py *.json recursive-include solox/report *.html *.js *.css *.png *.py *.json *.log recursive-include solox/static *.html *.js *.css *.png *.py recursive-include solox/templates *.html *.js *.css *.png *.py diff --git a/solox/__init__.py b/solox/__init__.py index 529b8ee..03fd012 100644 --- a/solox/__init__.py +++ b/solox/__init__.py @@ -2,4 +2,4 @@ from __future__ import absolute_import -__version__ = '2.8.3' +__version__ = '2.8.4' diff --git a/solox/public/apm.py b/solox/public/apm.py index 9b3488e..72d5639 100644 --- a/solox/public/apm.py +++ b/solox/public/apm.py @@ -457,6 +457,7 @@ def __init__(self, pkgName=None, platform=Platform.Android, deviceId=None, self.record = record self.collect_all = collect_all d.devicesCheck(platform=self.platform, deviceid=self.deviceId, pkgname=self.pkgName) + self.start() def collectCpu(self): _cpu = CPU(self.pkgName, self.deviceId, self.platform, pid=self.pid) @@ -589,7 +590,6 @@ def setPerfs(self): def collectAll(self): try: - self.start() f.clear_file() process_num = 7 if self.record else 6 pool = multiprocessing.Pool(processes=process_num)