Date: Sat, 15 Aug 2009 12:34:36 -0700 From: Doug Barton <dougb@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: "Bjoern A. Zeeb" <bz@freebsd.org>, freebsd-current@freebsd.org Subject: Re: svn commit: r190514 - head/sys/conf Message-ID: <4A870DCC.10903@FreeBSD.org> In-Reply-To: <200908141004.09354.jhb@freebsd.org> References: <200903282317.n2SNHIjI015202@svn.freebsd.org> <4A846206.7010803@FreeBSD.org> <200908141004.09354.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000103030504020104010107 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit John Baldwin wrote: > On Thursday 13 August 2009 2:57:10 pm Doug Barton wrote: >> Bjoern A. Zeeb wrote: >>> Author: bz >>> Date: Sat Mar 28 23:17:18 2009 >>> New Revision: 190514 >>> URL: http://svn.freebsd.org/changeset/base/190514 >>> >>> Log: >>> For kernel builds reduce the impact of svnversion, just scanning >>> src/sys and not the entire src/ tree. >> Also, what problem are we really trying to solve here? With a >> populated cache it takes on average 5 seconds to run all of src, and >> just under 1 to do only sys. Is 4 seconds really that important to >> save? With a dry cache I'm sure it takes a little longer, but has >> anyone actually measured this? > > It takes far longer than 5 seconds here against a local SVN repo over NFS. Looking at this in a little more depth, the only place that the svnversion feature is relevant is for the kernel build. The other places that call newvers.sh don't make use of that information. So I've got a patch to the current version that only does the svn stuff if newvers.sh is being called for the kernel build. I've attached the regular svn diff and a -bB version since it's a bit hard to read. It's easier to see what's going on if you apply it. If no one objects I'll ask re@ for approval to commit it. Doug -- This .signature sanitized for your protection --------------000103030504020104010107 Content-Type: text/plain; name="newvers.sh-diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="newvers.sh-diff" SW5kZXg6IG5ld3ZlcnMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbmV3dmVycy5zaAkocmV2aXNp b24gMTk2MjU3KQorKysgbmV3dmVycy5zaAkod29ya2luZyBjb3B5KQpAQCAtODcsMjkgKzg3 LDI1IEBACiB2PWBjYXQgdmVyc2lvbmAgdT0ke1VTRVI6LXJvb3R9IGQ9YHB3ZGAgaD0ke0hP U1ROQU1FOi1gaG9zdG5hbWVgfSB0PWBkYXRlYAogaT1gJHtNQUtFOi1tYWtlfSAtViBLRVJO X0lERU5UYAogCi1mb3IgZGlyIGluIC9iaW4gL3Vzci9iaW4gL3Vzci9sb2NhbC9iaW47IGRv Ci0JaWYgWyAteCAiJHtkaXJ9L3N2bnZlcnNpb24iIF07IHRoZW4KLQkJc3ZudmVyc2lvbj0k e2Rpcn0vc3ZudmVyc2lvbgotCQlTUkNESVI9JHtkIyMqb2JqfQotCQlpZiBbIC1uICIkTUFD SElORSIgXTsgdGhlbgotCQkJU1JDRElSPSR7U1JDRElSIyMvJE1BQ0hJTkV9CitjYXNlICIk ZCIgaW4KKyovc3lzLyopCisJZm9yIGRpciBpbiAvYmluIC91c3IvYmluIC91c3IvbG9jYWwv YmluOyBkbworCQlpZiBbIC14ICIke2Rpcn0vc3ZudmVyc2lvbiIgXTsgdGhlbgorCQkJc3Zu dmVyc2lvbj0ke2Rpcn0vc3ZudmVyc2lvbgorCQkJU1JDRElSPSR7ZCMjKm9ian0KKwkJCWlm IFsgLW4gIiRNQUNISU5FIiBdOyB0aGVuCisJCQkJU1JDRElSPSR7U1JDRElSIyMvJE1BQ0hJ TkV9CisJCQlmaQorCQkJU1JDRElSPSR7U1JDRElSJSUvc3lzLyp9CisJCQlicmVhawogCQlm aQotCQlTUkNESVI9JHtTUkNESVIlJS9zeXMvKn0KLQkJYnJlYWsKLQlmaQotZG9uZQorCWRv bmUKIAotaWYgWyAtbiAiJHN2bnZlcnNpb24iIC1hIC1kICIke1NSQ0RJUn0vLnN2biIgXSA7 IHRoZW4KLQkjIElmIHdlIGFyZSBjYWxsZWQgZnJvbSB0aGUga2VybmVsIGJ1aWxkLCBsaW1p dAotCSMgdGhlIHNjb3BlIG9mIHN2bnZlcnNpb24gdG8gc3lzLyAuCi0JaWYgWyAtZSAiJHtT UkNESVJ9L3N5cy9jb25mL25ld3ZlcnMuc2giIF0gOyB0aGVuCi0JCXN2bj0iIHJgY2QgJFNS Q0RJUi9zeXMgJiYgJHN2bnZlcnNpb25gIgotCWVsc2UKLQkJc3ZuPSIgcmBjZCAkU1JDRElS ICYmICRzdm52ZXJzaW9uYCIKKwlpZiBbIC1uICIkc3ZudmVyc2lvbiIgLWEgLWQgIiR7U1JD RElSfS9zeXMvLnN2biIgXSA7IHRoZW4KKwkJc3ZuPSIgcmBjZCAke1NSQ0RJUn0vc3lzICYm ICRzdm52ZXJzaW9uYCIKIAlmaQotZWxzZQotCXN2bj0iIgotZmkKKwk7OworZXNhYwogCiBj YXQgPDwgRU9GID4gdmVycy5jCiAkQ09QWVJJR0hUCg== --------------000103030504020104010107 Content-Type: text/plain; name="newvers.sh-diffbB" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="newvers.sh-diffbB" LS0tIC5zdm4vdGV4dC1iYXNlL25ld3ZlcnMuc2guc3ZuLWJhc2UJMjAwOS0wNy0xNiAxMzoy MDozMS4wMDAwMDAwMDAgLTA3MDAKKysrIG5ld3ZlcnMuc2gJMjAwOS0wOC0xNSAxMjoyOToy Ny4wMDAwMDAwMDAgLTA3MDAKQEAgLTI4LDcgKzI4LDcgQEAKICMgU1VDSCBEQU1BR0UuCiAj CiAjCUAoIyluZXd2ZXJzLnNoCTguMSAoQmVya2VsZXkpIDQvMjAvOTQKLSMgJEZyZWVCU0Qk CisjICRGcmVlQlNEOiBoZWFkL3N5cy9jb25mL25ld3ZlcnMuc2ggMTk1NzEyIDIwMDktMDct MTUgMTc6Mjk6MDVaIGtlbnNtaXRoICQKIAogVFlQRT0iRnJlZUJTRCIKIFJFVklTSU9OPSI4 LjAiCkBAIC04Nyw3ICs4Nyw5IEBACiB2PWBjYXQgdmVyc2lvbmAgdT0ke1VTRVI6LXJvb3R9 IGQ9YHB3ZGAgaD0ke0hPU1ROQU1FOi1gaG9zdG5hbWVgfSB0PWBkYXRlYAogaT1gJHtNQUtF Oi1tYWtlfSAtViBLRVJOX0lERU5UYAogCi1mb3IgZGlyIGluIC9iaW4gL3Vzci9iaW4gL3Vz ci9sb2NhbC9iaW47IGRvCitjYXNlICIkZCIgaW4KKyovc3lzLyopCisJZm9yIGRpciBpbiAv YmluIC91c3IvYmluIC91c3IvbG9jYWwvYmluOyBkbwogCWlmIFsgLXggIiR7ZGlyfS9zdm52 ZXJzaW9uIiBdOyB0aGVuCiAJCXN2bnZlcnNpb249JHtkaXJ9L3N2bnZlcnNpb24KIAkJU1JD RElSPSR7ZCMjKm9ian0KQEAgLTk3LDE5ICs5OSwxMyBAQAogCQlTUkNESVI9JHtTUkNESVIl JS9zeXMvKn0KIAkJYnJlYWsKIAlmaQotZG9uZQorCWRvbmUKIAotaWYgWyAtbiAiJHN2bnZl cnNpb24iIC1hIC1kICIke1NSQ0RJUn0vLnN2biIgXSA7IHRoZW4KLQkjIElmIHdlIGFyZSBj YWxsZWQgZnJvbSB0aGUga2VybmVsIGJ1aWxkLCBsaW1pdAotCSMgdGhlIHNjb3BlIG9mIHN2 bnZlcnNpb24gdG8gc3lzLyAuCi0JaWYgWyAtZSAiJHtTUkNESVJ9L3N5cy9jb25mL25ld3Zl cnMuc2giIF0gOyB0aGVuCi0JCXN2bj0iIHJgY2QgJFNSQ0RJUi9zeXMgJiYgJHN2bnZlcnNp b25gIgotCWVsc2UKLQkJc3ZuPSIgcmBjZCAkU1JDRElSICYmICRzdm52ZXJzaW9uYCIKKwlp ZiBbIC1uICIkc3ZudmVyc2lvbiIgLWEgLWQgIiR7U1JDRElSfS9zeXMvLnN2biIgXSA7IHRo ZW4KKwkJc3ZuPSIgcmBjZCAke1NSQ0RJUn0vc3lzICYmICRzdm52ZXJzaW9uYCIKIAlmaQot ZWxzZQotCXN2bj0iIgotZmkKKwk7OworZXNhYwogCiBjYXQgPDwgRU9GID4gdmVycy5jCiAk Q09QWVJJR0hUCg== --------------000103030504020104010107--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A870DCC.10903>