public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
@ 2015-10-28  1:52 Zac Medico
  2015-10-28  3:28 ` Rick "Zero_Chaos" Farina
  2015-10-28 11:44 ` Alexander Berntsen
  0 siblings, 2 replies; 5+ messages in thread
From: Zac Medico @ 2015-10-28  1:52 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Zac Medico

X-Gentoo-Bug: 564222
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=564222
---
 pym/portage/dbapi/vartree.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5ba8d9d..bac9837 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -728,7 +728,11 @@ class vardbapi(dbapi):
 		if pkg_data:
 			cache_mtime, metadata = pkg_data
 			if isinstance(cache_mtime, float):
-				cache_valid = cache_mtime == mydir_stat.st_mtime
+				# Handle truncated mtime in order to avoid cache
+				# invalidation for livecd squashfs (bug 564222).
+				cache_valid = cache_mtime == mydir_stat.st_mtime or (
+					mydir_stat.st_mtime == mydir_stat[stat.ST_MTIME]
+					and long(cache_mtime) == mydir_stat[stat.ST_MTIME])
 			else:
 				# Cache may contain integer mtime.
 				cache_valid = cache_mtime == mydir_stat[stat.ST_MTIME]
-- 
2.4.9



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
  2015-10-28  1:52 [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222) Zac Medico
@ 2015-10-28  3:28 ` Rick "Zero_Chaos" Farina
  2015-10-28 11:44 ` Alexander Berntsen
  1 sibling, 0 replies; 5+ messages in thread
From: Rick "Zero_Chaos" Farina @ 2015-10-28  3:28 UTC (permalink / raw
  To: gentoo-portage-dev

This speeds up initial emerge run on my livecd by eight minutes.  Please
accept.

Thanks,
Zero

On 10/27/2015 09:52 PM, Zac Medico wrote:
> X-Gentoo-Bug: 564222
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=564222
> ---
>  pym/portage/dbapi/vartree.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
> index 5ba8d9d..bac9837 100644
> --- a/pym/portage/dbapi/vartree.py
> +++ b/pym/portage/dbapi/vartree.py
> @@ -728,7 +728,11 @@ class vardbapi(dbapi):
>  		if pkg_data:
>  			cache_mtime, metadata = pkg_data
>  			if isinstance(cache_mtime, float):
> -				cache_valid = cache_mtime == mydir_stat.st_mtime
> +				# Handle truncated mtime in order to avoid cache
> +				# invalidation for livecd squashfs (bug 564222).
> +				cache_valid = cache_mtime == mydir_stat.st_mtime or (
> +					mydir_stat.st_mtime == mydir_stat[stat.ST_MTIME]
> +					and long(cache_mtime) == mydir_stat[stat.ST_MTIME])
>  			else:
>  				# Cache may contain integer mtime.
>  				cache_valid = cache_mtime == mydir_stat[stat.ST_MTIME]
> 



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
  2015-10-28  1:52 [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222) Zac Medico
  2015-10-28  3:28 ` Rick "Zero_Chaos" Farina
@ 2015-10-28 11:44 ` Alexander Berntsen
  2015-10-28 16:31   ` Zac Medico
  1 sibling, 1 reply; 5+ messages in thread
From: Alexander Berntsen @ 2015-10-28 11:44 UTC (permalink / raw
  To: gentoo-portage-dev

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Sheesh. That expression barely fits in a tweet. ;) Please just use
intermediate statements or an if or something. Otherwise LGTM.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWMLUHAAoJENQqWdRUGk8BdkkQANcyuwqNAp1kmj1OPBvE9Nw/
HUFZ/mKrtSgAQCMLkG9awS/8h+cq/GPru+KMHmh3uS8EIcSKPkDKcN1Zrb8dl3sv
RFa4GqwlGP/QRk8yUmwTCrdX9GQ2NYSJ048JGZ3HkpvwZiOhUPqXprrUMm64qkov
Ou1Ks2erkEptQqQTD9Ezcd+ylSSLaNx4fnAypMc92aR99fChmf8YNR28KQjI2ghw
b9CIN3r4F/D1mu3sUsw2aHsqvessiI4dgMqYbYnqn024bLIILznbHXQFpsNjYC38
aUrrfkn1aapzM8+92bpzizJmBbH9Cj4Dp21suDivOHXqWJBNdkmVAz5RXepG9/0F
OEZ8QJJelLICzunnIJ0dvepSJj0av+24UWe3WoPOx5MTuSaELs/d9QXWQUc9QM0c
494PQsTNNy9Zshro4Yv6PyfyA6zvT9xRK06/Ed7edywjAJCtcgQ5P5svfw1MJ9V4
JChGtcvasXcTi4mWgUqohrFGfwePoONlXMAY29WSicOx/LyFZiPrLFQuZmpH+ml7
twVcK2rPcO8yGtCcl1MxRiSnr6VUFGPbSFVmUFjVXJN7NoLQtJyfHofSBYrCzWFF
LvzNj4Xt3+SPehh0NOPPCyTtjUinOjuTILGRJWTxE7TsK+cI7iSqJsX4tNYR2WIi
rzqoClu1tUQbHgmLEU4Y
=Lzt8
-----END PGP SIGNATURE-----


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
  2015-10-28 11:44 ` Alexander Berntsen
@ 2015-10-28 16:31   ` Zac Medico
  2015-10-29  9:30     ` Alexander Berntsen
  0 siblings, 1 reply; 5+ messages in thread
From: Zac Medico @ 2015-10-28 16:31 UTC (permalink / raw
  To: gentoo-portage-dev

On 10/28/2015 04:44 AM, Alexander Berntsen wrote:
> Sheesh. That expression barely fits in a tweet. ;) Please just use
> intermediate statements or an if or something. Otherwise LGTM.

I've split it with an if, and also eliminated a redundant comparison
since long(cache_mtime) == mydir_stat.st_mtime implies that
mydir_stat.st_mtime == mydir_stat[stat.ST_MTIME], so here's what I've
pushed:

	if cache_mtime == mydir_stat.st_mtime:
		cache_valid = True

	# Handle truncated mtime in order to avoid cache
	# invalidation for livecd squashfs (bug 564222).
	elif long(cache_mtime) == mydir_stat.st_mtime:
		cache_valid = True

-- 
Thanks,
Zac


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
  2015-10-28 16:31   ` Zac Medico
@ 2015-10-29  9:30     ` Alexander Berntsen
  0 siblings, 0 replies; 5+ messages in thread
From: Alexander Berntsen @ 2015-10-29  9:30 UTC (permalink / raw
  To: gentoo-portage-dev

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Yep, looks good.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWMecxAAoJENQqWdRUGk8B7JAP/i8pU6Geolcqk4yXK3g3CVjb
fRSB6/XKXYR1xjtWKhwO61FIAuxFk1FM6LvALPR/vQfu+eySBC9LXbhHsLf2c6y4
GphEt+OAI17wKXOiyum6OeIyiETaOrcgLa3hLEkCuXvjIxdfDymZwPHyeuqeDX6t
gqcmC8NZ+tyL97tkv8fYBT/c7T7o6REkQpfkcXre8cIQnY8r+yV8/CgadEaUipEh
dQunq3NmVi6YzmLlHj/t32zuYj8ZSMwOJ0UO3BTNLlGwSE7S2abM8cmTu5CVvGoS
ojnx/BKrekjGgcvK4HhbcDsZIZRqP1ca5wwVrLc6mw2ge7Qy9GRGs6OdeWdLGQFx
MCHUFZww8Ek3X3ngn7WHIaEEUgMrFqw01wsbQNZ0ZAf74d5QGzAGdAvg5DNAKydS
T8Kh8engDYof7o+uJa6HovWZJFgks6fdY2+kDl5NQSQgDAg2JdyvabM2Sc1AsTT1
ZYeogh3ccVtyHbI4Ipxa4mTs/1bjU6wI5TaO+oquaOHO4IQpRVCs4uylaAGbd0jg
ef3MSGZgrJW/EG7ytygT9cClBUDADf3kJGbm2jZVCbFDM0QX/X0xzv06ByD0XD/i
ZdA0PtoFUs5JNx1LKtwjrsO8lcc+OyMoBLnmht3ziuWDczicDDRezgjm2kmC4f1W
jacjcqxuhpyKHg1YF707
=sZRy
-----END PGP SIGNATURE-----


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-10-29  9:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-28  1:52 [gentoo-portage-dev] [PATCH] vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222) Zac Medico
2015-10-28  3:28 ` Rick "Zero_Chaos" Farina
2015-10-28 11:44 ` Alexander Berntsen
2015-10-28 16:31   ` Zac Medico
2015-10-29  9:30     ` Alexander Berntsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox