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
e330b12
..
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
@@
-1262,11
+1260,11
@@
class InputData(object):
file_name = self._cfg.input["file-name"]
full_name = join(
self._cfg.environment["paths"]["DIR[WORKING,DATA]"],
file_name = self._cfg.input["file-name"]
full_name = join(
self._cfg.environment["paths"]["DIR[WORKING,DATA]"],
- "{job}{sep}{build}{sep}{name}".
-
format(
job=job,
-
sep=SEPARATOR,
-
build=build["build"],
-
name=file_name))
+ "{job}{sep}{build}{sep}{name}".
format(
+ job=job,
+ sep=SEPARATOR,
+ build=build["build"],
+ name=file_name))
try:
remove(full_name)
logs.append(("INFO",
try:
remove(full_name)
logs.append(("INFO",
@@
-1307,12
+1305,8
@@
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)
-
- job = result["job"]
build_nr = result["build"]["build"]
build_nr = result["build"]["build"]
- logging.info(" {job}-{build}".format(job=job,
- build=build_nr))
if result["data"]:
data = result["data"]
build_data = pd.Series({
if result["data"]:
data = result["data"]
build_data = pd.Series({
@@
-1333,6
+1327,9
@@
class InputData(object):
self._cfg.set_input_state(job, build_nr, 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.")
@staticmethod
logging.info("Done.")
@staticmethod