Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Trending: Remove multiprocessing from cpta
[csit.git]
/
resources
/
tools
/
presentation
/
input_data_parser.py
diff --git
a/resources/tools/presentation/input_data_parser.py
b/resources/tools/presentation/input_data_parser.py
index
8356091
..
3b3be9f
100644
(file)
--- a/
resources/tools/presentation/input_data_parser.py
+++ b/
resources/tools/presentation/input_data_parser.py
@@
-19,9
+19,8
@@
- filter the data using tags,
"""
- filter the data using tags,
"""
-import multiprocessing
-import os
import re
import re
+import resource
import pandas as pd
import logging
import pandas as pd
import logging
@@
-37,7
+36,6
@@
from json import loads
from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory
from input_data_files import download_and_unzip_data_file
from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory
from input_data_files import download_and_unzip_data_file
-from utils import Worker
# Separator used in file names
# Separator used in file names
@@
-1307,6
+1305,7
@@
class InputData(object):
for build in builds:
result = self._download_and_parse_build(job, build, repeat)
for build in builds:
result = self._download_and_parse_build(job, build, repeat)
+ build_nr = result["build"]["build"]
if result["data"]:
data = result["data"]
if result["data"]:
data = result["data"]
@@
-1321,12
+1320,15
@@
class InputData(object):
if self._input_data.get(job, None) is None:
self._input_data[job] = pd.Series()
if self._input_data.get(job, None) is None:
self._input_data[job] = pd.Series()
- self._input_data[job][str(build)] = build_data
+ self._input_data[job][str(build
_nr
)] = build_data
self._cfg.set_input_file_name(
self._cfg.set_input_file_name(
- job, build, result["build"]["file-name"])
+ job, build
_nr
, result["build"]["file-name"])
- self._cfg.set_input_state(job, build, result["state"])
+ self._cfg.set_input_state(job, build_nr, result["state"])
+
+ logging.info("Memory allocation: {0:,d}MB".format(
+ resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000))
logging.info("Done.")
logging.info("Done.")