From 48b9616b47d311bf2d336e22205e8555fa12e454 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Tue, 19 Jan 2010 14:58:54 +0000
Subject: simplify caching: return $cached->{$_} //= new_value; remove stats
 cache LibSpec as well (1000 c.53.0 !)

---
 usr.sbin/pkg_add/OpenBSD/PackageName.pm | 40 +++------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'usr.sbin/pkg_add/OpenBSD/PackageName.pm')

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageName.pm b/usr.sbin/pkg_add/OpenBSD/PackageName.pm
index 8a100d91076..60c592503fa 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageName.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageName.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageName.pm,v 1.40 2010/01/10 11:31:08 espie Exp $
+# $OpenBSD: PackageName.pm,v 1.41 2010/01/19 14:58:53 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -44,37 +44,11 @@ sub splitname
 }
 
 my $cached = {};
-my $calls = 0;
-my $nohits = 0;
-my $dewey_calls = 0;
-my $dewey_hits = 0;
-my $tocalls = 0;
-my $strings = 0;
-
-sub stats
-{
-	require Devel::Size;
-
-	print STDERR "Size=", Devel::Size::total_size($cached), "\n";
-	print STDERR "Total calls: ", $calls, "\n";
-	print STDERR "Cache hits: ", $calls - $nohits, "\n";
-	print STDERR "Dewey calls: ", $dewey_calls, "\n";
-	print STDERR "Dewey hits: ", $dewey_hits, "\n";
-	print STDERR "to_string calls: ", $tocalls, "\n";
-	print STDERR "string compares: ", $strings, "\n";
-#	print STDERR join(',', sort keys %$cached), "\n";
-}
 
 sub from_string
 {
 	my ($class, $_) = @_;
-	$calls++;
-	if (!defined $cached->{$_}) {
-		$nohits++;
-		return $cached->{$_} = $class->new_from_string($_);
-	} else {
-		return $cached->{$_};
-	}
+	return $cached->{$_} //= $class->new_from_string($_);
 }
 
 sub new_from_string
@@ -195,13 +169,7 @@ sub from_string
 sub make
 {
 	my ($class, $string) = @_;
-	$dewey_calls++;
-	if (!defined $cache->{$string}) {
-		return $cache->{$string} = $class->from_string($string);
-	} else {
-		$dewey_hits++;
-		return $cache->{$string};
-	}
+	return $cache->{$string} //= $class->from_string($string);
 }
 
 sub to_string
@@ -308,7 +276,6 @@ sub from_string
 sub to_string
 {
 	my $o = shift;
-	$tocalls++;
 	my $string = $o->{dewey}->to_string;
 	if (defined $o->{p}) {
 		$string .= 'p'.$o->{p};
@@ -334,7 +301,6 @@ sub compare
 	}
 	# Simple case: only p number differs
 	if ($a->{dewey} eq $b->{dewey}) {
-		$strings++;
 		return $a->pnum_compare($b);
 	} 
 
-- 
cgit v1.2.3