buildstats: Clean up e.data and bb.data references
Rather than bb.data and e.data, cleanup to use 'd' and match the standard coding style. (From OE-Core rev: dbce2c6122d492ba86873db4d02322f0df7a6752) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7b1e48f9c7
commit
38a2553864
|
@ -20,7 +20,7 @@ def get_cputime():
|
||||||
fields = f.readline().rstrip().split()[1:]
|
fields = f.readline().rstrip().split()[1:]
|
||||||
return sum(int(field) for field in fields)
|
return sum(int(field) for field in fields)
|
||||||
|
|
||||||
def set_timedata(var, data, server_time=None):
|
def set_timedata(var, d, server_time=None):
|
||||||
import time
|
import time
|
||||||
if server_time:
|
if server_time:
|
||||||
time = server_time
|
time = server_time
|
||||||
|
@ -28,11 +28,11 @@ def set_timedata(var, data, server_time=None):
|
||||||
time = time.time()
|
time = time.time()
|
||||||
cputime = get_cputime()
|
cputime = get_cputime()
|
||||||
proctime = get_process_cputime(os.getpid())
|
proctime = get_process_cputime(os.getpid())
|
||||||
data.setVar(var, (time, cputime, proctime))
|
d.setVar(var, (time, cputime, proctime))
|
||||||
|
|
||||||
def get_timedata(var, data, server_time=None):
|
def get_timedata(var, d, server_time=None):
|
||||||
import time
|
import time
|
||||||
timedata = data.getVar(var, False)
|
timedata = d.getVar(var, False)
|
||||||
if timedata is None:
|
if timedata is None:
|
||||||
return
|
return
|
||||||
oldtime, oldcpu, oldproc = timedata
|
oldtime, oldcpu, oldproc = timedata
|
||||||
|
@ -49,15 +49,15 @@ def get_timedata(var, data, server_time=None):
|
||||||
cpuperc = None
|
cpuperc = None
|
||||||
return timediff, cpuperc
|
return timediff, cpuperc
|
||||||
|
|
||||||
def write_task_data(status, logfile, e):
|
def write_task_data(status, logfile, e, d):
|
||||||
bn = e.data.getVar('BUILDNAME', True)
|
bn = d.getVar('BUILDNAME', True)
|
||||||
bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn)
|
bsdir = os.path.join(d.getVar('BUILDSTATS_BASE', True), bn)
|
||||||
with open(os.path.join(logfile), "a") as f:
|
with open(os.path.join(logfile), "a") as f:
|
||||||
timedata = get_timedata("__timedata_task", e.data, e.time)
|
timedata = get_timedata("__timedata_task", d, e.time)
|
||||||
if timedata:
|
if timedata:
|
||||||
elapsedtime, cpu = timedata
|
elapsedtime, cpu = timedata
|
||||||
f.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" %
|
f.write(d.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" %
|
||||||
(e.task, elapsedtime), e.data))
|
(e.task, elapsedtime)))
|
||||||
if cpu:
|
if cpu:
|
||||||
f.write("CPU usage: %0.1f%% \n" % cpu)
|
f.write("CPU usage: %0.1f%% \n" % cpu)
|
||||||
if status is "passed":
|
if status is "passed":
|
||||||
|
@ -69,12 +69,11 @@ def write_task_data(status, logfile, e):
|
||||||
python run_buildstats () {
|
python run_buildstats () {
|
||||||
import bb.build
|
import bb.build
|
||||||
import bb.event
|
import bb.event
|
||||||
import bb.data
|
|
||||||
import time, subprocess, platform
|
import time, subprocess, platform
|
||||||
|
|
||||||
bn = e.data.getVar('BUILDNAME', True)
|
bn = d.getVar('BUILDNAME', True)
|
||||||
bsdir = os.path.join(e.data.getVar('BUILDSTATS_BASE', True), bn)
|
bsdir = os.path.join(d.getVar('BUILDSTATS_BASE', True), bn)
|
||||||
taskdir = os.path.join(bsdir, e.data.getVar('PF', True))
|
taskdir = os.path.join(bsdir, d.getVar('PF', True))
|
||||||
|
|
||||||
if isinstance(e, bb.event.BuildStarted):
|
if isinstance(e, bb.event.BuildStarted):
|
||||||
########################################################################
|
########################################################################
|
||||||
|
@ -82,7 +81,7 @@ python run_buildstats () {
|
||||||
# set the buildname
|
# set the buildname
|
||||||
########################################################################
|
########################################################################
|
||||||
bb.utils.mkdirhier(bsdir)
|
bb.utils.mkdirhier(bsdir)
|
||||||
set_timedata("__timedata_build", e.data)
|
set_timedata("__timedata_build", d)
|
||||||
build_time = os.path.join(bsdir, "build_stats")
|
build_time = os.path.join(bsdir, "build_stats")
|
||||||
# write start of build into build_time
|
# write start of build into build_time
|
||||||
with open(build_time, "a") as f:
|
with open(build_time, "a") as f:
|
||||||
|
@ -100,7 +99,7 @@ python run_buildstats () {
|
||||||
########################################################################
|
########################################################################
|
||||||
# Write build statistics for the build
|
# Write build statistics for the build
|
||||||
########################################################################
|
########################################################################
|
||||||
timedata = get_timedata("__timedata_build", e.data)
|
timedata = get_timedata("__timedata_build", d)
|
||||||
if timedata:
|
if timedata:
|
||||||
time, cpu = timedata
|
time, cpu = timedata
|
||||||
# write end of build and cpu used into build_time
|
# write end of build and cpu used into build_time
|
||||||
|
@ -109,7 +108,7 @@ python run_buildstats () {
|
||||||
f.write("CPU usage: %0.1f%% \n" % cpu)
|
f.write("CPU usage: %0.1f%% \n" % cpu)
|
||||||
|
|
||||||
if isinstance(e, bb.build.TaskStarted):
|
if isinstance(e, bb.build.TaskStarted):
|
||||||
set_timedata("__timedata_task", e.data, e.time)
|
set_timedata("__timedata_task", d, e.time)
|
||||||
bb.utils.mkdirhier(taskdir)
|
bb.utils.mkdirhier(taskdir)
|
||||||
# write into the task event file the name and start time
|
# write into the task event file the name and start time
|
||||||
with open(os.path.join(taskdir, e.task), "a") as f:
|
with open(os.path.join(taskdir, e.task), "a") as f:
|
||||||
|
@ -117,16 +116,16 @@ python run_buildstats () {
|
||||||
f.write("Started: %0.2f \n" % e.time)
|
f.write("Started: %0.2f \n" % e.time)
|
||||||
|
|
||||||
elif isinstance(e, bb.build.TaskSucceeded):
|
elif isinstance(e, bb.build.TaskSucceeded):
|
||||||
write_task_data("passed", os.path.join(taskdir, e.task), e)
|
write_task_data("passed", os.path.join(taskdir, e.task), e, d)
|
||||||
if e.task == "do_rootfs":
|
if e.task == "do_rootfs":
|
||||||
bs = os.path.join(bsdir, "build_stats")
|
bs = os.path.join(bsdir, "build_stats")
|
||||||
with open(bs, "a") as f:
|
with open(bs, "a") as f:
|
||||||
rootfs = e.data.getVar('IMAGE_ROOTFS', True)
|
rootfs = d.getVar('IMAGE_ROOTFS', True)
|
||||||
rootfs_size = subprocess.Popen(["du", "-sh", rootfs], stdout=subprocess.PIPE).stdout.read()
|
rootfs_size = subprocess.Popen(["du", "-sh", rootfs], stdout=subprocess.PIPE).stdout.read()
|
||||||
f.write("Uncompressed Rootfs size: %s" % rootfs_size)
|
f.write("Uncompressed Rootfs size: %s" % rootfs_size)
|
||||||
|
|
||||||
elif isinstance(e, bb.build.TaskFailed):
|
elif isinstance(e, bb.build.TaskFailed):
|
||||||
write_task_data("failed", os.path.join(taskdir, e.task), e)
|
write_task_data("failed", os.path.join(taskdir, e.task), e, d)
|
||||||
########################################################################
|
########################################################################
|
||||||
# Lets make things easier and tell people where the build failed in
|
# Lets make things easier and tell people where the build failed in
|
||||||
# build_status. We do this here because BuildCompleted triggers no
|
# build_status. We do this here because BuildCompleted triggers no
|
||||||
|
@ -134,7 +133,7 @@ python run_buildstats () {
|
||||||
########################################################################
|
########################################################################
|
||||||
build_status = os.path.join(bsdir, "build_stats")
|
build_status = os.path.join(bsdir, "build_stats")
|
||||||
with open(build_status, "a") as f:
|
with open(build_status, "a") as f:
|
||||||
f.write(e.data.expand("Failed at: ${PF} at task: %s \n" % e.task))
|
f.write(d.expand("Failed at: ${PF} at task: %s \n" % e.task))
|
||||||
}
|
}
|
||||||
|
|
||||||
addhandler run_buildstats
|
addhandler run_buildstats
|
||||||
|
|
Loading…
Reference in New Issue