summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/classes/base.bbclass1
-rw-r--r--meta/classes/buildstats.bbclass194
-rw-r--r--meta/recipes-connectivity/gypsy/gypsy_git.bb15
-rw-r--r--meta/recipes-connectivity/gypsy/gypsy_svn.bb9
4 files changed, 210 insertions, 9 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e4ea69d48..a674f52fb 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -7,6 +7,7 @@ inherit mirrors
inherit utils
inherit utility-tasks
inherit metadata_scm
+inherit buildstats
python sys_path_eh () {
if isinstance(e, bb.event.ConfigParsed):
diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
new file mode 100644
index 000000000..f57d01806
--- /dev/null
+++ b/meta/classes/buildstats.bbclass
@@ -0,0 +1,194 @@
+BUILDSTATS_BASE = ${TMPDIR}/buildstats/
+BNFILE = ${BUILDSTATS_BASE}/.buildname
+
+################################################################################
+# Build statistics gathering.
+#
+# The CPU and Time gathering/tracking functions and bbevent inspiration
+# were written by Christopher Larson and can be seen here:
+# http://kergoth.pastey.net/142813
+#
+################################################################################
+
+def get_process_cputime(pid):
+ fields = open("/proc/%d/stat" % pid, "r").readline().rstrip().split()
+ # 13: utime, 14: stime, 15: cutime, 16: cstime
+ return sum(int(field) for field in fields[13:16])
+
+def get_cputime():
+ fields = open("/proc/stat", "r").readline().rstrip().split()[1:]
+ return sum(int(field) for field in fields)
+
+def set_timedata(var, data):
+ import time
+
+ time = time.time()
+ cputime = get_cputime()
+ proctime = get_process_cputime(os.getpid())
+ data.setVar(var, (time, cputime, proctime))
+
+def get_timedata(var, data):
+ import time
+ timedata = data.getVar(var, False)
+ if timedata is None:
+ return
+ oldtime, oldcpu, oldproc = timedata
+ procdiff = get_process_cputime(os.getpid()) - oldproc
+ cpudiff = get_cputime() - oldcpu
+ timediff = time.time() - oldtime
+ if cpudiff > 0:
+ cpuperc = float(procdiff) * 100 / cpudiff
+ else:
+ cpuperc = None
+ return timediff, cpuperc
+
+##############################################
+# We need to set the buildname to a file since
+# BUILDNAME changes throughout a build
+##############################################
+
+def set_bn(e):
+ bn = e.getPkgs()[0] + "-" + bb.data.getVar('MACHINE',e.data, True)
+ try:
+ os.remove(bb.data.getVar('BNFILE',e.data, True))
+ except:
+ pass
+ file = open(bb.data.getVar('BNFILE',e.data, True), "w")
+ file.write(os.path.join(bn, bb.data.getVar('BUILDNAME', e.data, True)))
+ file.close()
+
+def get_bn(e):
+ file = open(bb.data.getVar('BNFILE',e.data, True))
+ bn = file.readline()
+ file.close()
+ return bn
+
+python run_buildstats () {
+ import bb.build
+ import bb.event
+ import bb.data
+ import time, subprocess
+
+ if isinstance(e, bb.event.BuildStarted):
+ ##############################################
+ # at first pass make the buildstats heriarchy and then
+ # set the buildname
+ ##############################################
+ try:
+ bb.mkdirhier(bb.data.getVar('BUILDSTATS_BASE', e.data, True))
+ except:
+ pass
+ set_bn(e)
+ bn = get_bn(e)
+ bb.warn(bn)
+ bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
+ try:
+ bb.mkdirhier(bsdir)
+ except:
+ pass
+ set_timedata("__timedata_build", e.data)
+ build_time = os.path.join(bsdir, "build_stats")
+ # write start of build into build_time
+ file = open(build_time,"a")
+ # We do this here because subprocess within BuildStarted is messy
+ host_info = subprocess.Popen(["uname", "-a"], stdout=subprocess.PIPE).stdout.read()
+ file.write("Host Info: %s" % host_info)
+ file.write("Build Started: %0.2f \n" % time.time())
+ file.close()
+
+ elif isinstance(e, bb.event.BuildCompleted):
+ bn=get_bn(e)
+ timedata = get_timedata("__timedata_build", e.data)
+ if not timedata:
+ return
+ time, cpu = timedata
+ bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
+ build_time = os.path.join(bsdir, "build_stats")
+ # write end of build and cpu used into build_time
+ file = open(build_time, "a")
+ file.write("Elapsed time: %0.2f seconds \n" % (time))
+ if cpu:
+ file.write("CPU usage: %0.1f%% \n" % cpu)
+ file.close()
+
+
+ if isinstance(e, bb.build.TaskStarted):
+ bn=get_bn(e)
+ set_timedata("__timedata_task", e.data)
+
+ bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
+ taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
+ try:
+ bb.mkdirhier(taskdir)
+ except:
+ pass
+ # write into the task event file the name and start time
+ file = open(os.path.join(taskdir, e.task), "a")
+ file.write("Event: %s \n" % bb.event.getName(e))
+ file.write("Started: %0.2f \n" % time.time())
+ file.close()
+
+ elif isinstance(e, bb.build.TaskSucceeded):
+ bn=get_bn(e)
+ timedata = get_timedata("__timedata_task", e.data)
+ if not timedata:
+ return
+ time, cpu = timedata
+ bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
+ taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
+ file = open(os.path.join(taskdir, e.task), "a")
+ file.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" %
+ (e.task, time), e.data))
+ if cpu:
+ file.write("CPU usage: %0.1f%% \n" % cpu)
+
+ file.write("Status: PASSED")
+ file.close()
+
+ ##############################################
+ # Alot of metric gathering occurs here.
+ # Reminder: I stripped out some in process stuff here
+ ##############################################
+
+ if e.task == "do_rootfs":
+ bs=os.path.join(bsdir, "build_stats")
+ file = open(bs,"a")
+ rootfs = bb.data.getVar('IMAGE_ROOTFS', e.data, True)
+ rootfs_size = subprocess.Popen(["du", "-sh", rootfs], stdout=subprocess.PIPE).stdout.read()
+ file.write("Uncompressed Rootfs size: %s" % rootfs_size)
+ file.close()
+
+ elif isinstance(e, bb.build.TaskFailed):
+ bn=get_bn(e)
+ timedata = get_timedata("__timedata_task", e.data)
+ if not timedata:
+ return
+ time, cpu = timedata
+ bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
+ taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
+ ##############################################
+ # If the task fails dump the regular data.
+ # fgrep -R "FAILED" <bsdir>
+ # will grep all the events that failed.
+ ##############################################
+ file = open(os.path.join(taskdir, e.task), "a")
+ file.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" %
+ (e.task, time), e.data))
+ if cpu:
+ file.write("CPU usage: %0.1f%% \n" % cpu)
+ file.write("Status: FAILED")
+ file.close()
+ ##############################################
+ # Lets make things easier and tell people where the build failed in build_status
+ # We do this here because BuildCompleted triggers no matter what the status of the
+ # build actually is
+ ##############################################
+ build_status = os.path.join(bsdir, "build_stats")
+ file = open(build_status,"a")
+ file.write(bb.data.expand("Failed at: ${PF} at task: %s \n", e.task))
+ file.close()
+
+}
+
+addhandler run_buildstats
+
diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb
new file mode 100644
index 000000000..13572404e
--- /dev/null
+++ b/meta/recipes-connectivity/gypsy/gypsy_git.bb
@@ -0,0 +1,15 @@
+require gypsy.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.8+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+ file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \
+ file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \
+ file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
+
+SRC_URI = "git://anongit.freedesktop.org/gypsy;protocol=git \
+ file://fixups.patch;patch=1"
diff --git a/meta/recipes-connectivity/gypsy/gypsy_svn.bb b/meta/recipes-connectivity/gypsy/gypsy_svn.bb
deleted file mode 100644
index 2e9840afd..000000000
--- a/meta/recipes-connectivity/gypsy/gypsy_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gypsy.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.0+svnr${SRCPV}"
-S = "${WORKDIR}/${PN}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
- file://fixups.patch;patch=1"