From 70f1605f697711b1d41b7e6acbba4d02df8570f0 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Wed, 29 Jul 2009 18:18:48 +0000 Subject: [PATCH] Add kfreebsd to the stats. --- bin/wb-graph | 2 +- etc/graph.R | 35 ++++++++++++++++++++++++----------- trigger.daily | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/bin/wb-graph b/bin/wb-graph index 9419380..fb85f09 100755 --- a/bin/wb-graph +++ b/bin/wb-graph @@ -40,7 +40,7 @@ my $date=`date +%m/%d/%Y`; chop($date); print "$date"; -my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel); +my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel kfreebsd-amd64 kfreebsd-i386); my $arch; foreach $arch (@archs) { diff --git a/etc/graph.R b/etc/graph.R index a530a28..4070d3f 100644 --- a/etc/graph.R +++ b/etc/graph.R @@ -1,6 +1,7 @@ -arch <- c("alpha", "amd64", "armel", "hppa", "i386", "ia64", "mips", - "mipsel", "powerpc", "s390", "sparc") -palette(c("black", "turquoise", "red", "OrangeRed", "green3", "cyan", "magenta", +arch <- c("alpha", "amd64", "armel", "hppa", "i386", "ia64", "kfreebsd-amd64", + "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390", "sparc") +palette(c("black", "turquoise", "red", "OrangeRed", "green3", "cyan", + "blue", "yellow", "magenta", "violetred2","thistle4", "steelblue2", "springgreen4", "salmon")) @@ -8,26 +9,38 @@ readdata <- function (file,start) { t <- read.table(file,row.names=1,header=FALSE, sep=",",col.names=c("date","alpha","at","arm","art","hppa","ht","hurd-i386", "hit","i386","it","ia64","i6t","m68k","mt","mips","mit","mipsel","mipt", - "powerpc","pt","s390","st","amd64","amdt","sparc","spt","armel","aret")) - ts(as.matrix(data.frame(t[1]/t[2]*100,t[23]/t[24]*100, - t[27]/t[28]*100,t[5]/t[6]*100,t[9]/t[10]*100,t[11]/t[12]*100, - t[15]/t[16]*100,t[17]/t[18]*100,t[19]/t[20]*100, - t[21]/t[22]*100,t[25]/t[26]*100)),c(2001,start),frequency=365.25) + "powerpc","pt","s390","st","amd64","amdt","sparc","spt","armel","aret", + "kfreebsd-amd64", "kfreebsd-amd64-t", "kfreebsd-i386", "kfreebsd-i386-t")) + ts(as.matrix(data.frame( + t[1]/t[2]*100, #alpha + t[23]/t[24]*100, #amd64 + t[27]/t[28]*100, #armel + t[5]/t[6]*100, #hppa + t[9]/t[10]*100, #i386 + t[11]/t[12]*100, #ia64 + t[29]/t[30]*100, #fkfreebsd-amd64 + t[31]/t[32]*100, #kfreebsd-i386 + t[15]/t[16]*100, #mips + t[17]/t[18]*100, #mipsel + t[19]/t[20]*100, #powerpc + t[21]/t[22]*100, #s390 + t[25]/t[26]*100 #sparc + )),c(2001,start),frequency=365.25) } -plotwb <- function (file,title,p,linept=85,height=7.5,width=10,pch=1:14) { +plotwb <- function (file,title,p,linept=85,height=7.5,width=10,pch=1:16) { bitmap(file=file,type="png16m",width=width,height=height,res=64) layout(matrix(c(1,1,2,2),2,2),widths=c(0.85,0.15)) par(mar=c(5,4,4,2)+0.1) par(lab=c(10,10,7)) - plot(p,type="o",plot.type="single",col=1:14,pch=pch,xlab="date", + plot(p,type="o",plot.type="single",col=1:16,pch=pch,xlab="date", ylab="percentage of packages",main=title,cex=2) abline(h=90,lty=2,col=3) abline(h=linept,lty=2,col=3) axis(4) plot.new() par(plt=c(0,1,0,1)) - legend(-1.2,1, arch, col=1:14, pch=pch, lwd=2, bg='gray90', cex=1.5) + legend(-1.2,1, arch, col=1:16, pch=pch, lwd=2, bg='gray90', cex=1.5) } v <- readdata("/org/wanna-build/etc/graph-data",164) plotwb("/org/buildd.debian.org/web/stats/graph.png","What percent is built for each architecture",v,85,7.5,10,".") diff --git a/trigger.daily b/trigger.daily index 20b88ef..c822295 100755 --- a/trigger.daily +++ b/trigger.daily @@ -227,7 +227,7 @@ if (( $last + $interval < $now )); then rm -f "$LOCKFILE" trap - 0 /srv/buildd.debian.org/bin/makegraph - for a in $ARCHS_stable; do + for a in $ALL_ARCHES; do echo Last Updated: `date -u` > /srv/buildd.debian.org/web/stats/$a.txt for d in $STATS_DISTS; do /srv/wanna-build/bin/wanna-build-statistics --database=$a/build-db --dist=$d >> /srv/buildd.debian.org/web/stats/$a.txt -- 2.39.2