If $cache provides CHI compatible ->compute($key, $code) method, use it
instead of Cache::Cache compatible ->get($key) and ->set($key, $data).
While at it, refactor regenerating cache into cache_calculate subroutine.
GitwebCache::SimpleFileCache provides 'compute' method, which currently
simply use 'get' and 'set' methods in proscribed manner. Nevertheless
'compute' method can be more flexible in choosing when to refresh cache,
and which process is to refresh/(re)generate cache entry. This method
would use (advisory) locking to prevent 'cache miss stampede' (aka
'stampeding herd') problem in the next commit.
The support for $cache which do not provide '->compute($key, $code)'
method is left just in case we would want to use such (external)
caching engine.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
This commit could be moved one commit earlier in this patch series for
shortlog to look nicer (although commit message would have to be adjusted to
that fact) ;-)
Differences from v1:
* Proper commit message
* cache_calculate uses cache_capture and is therefore shorter
* Don't set $/ to undef, which applies to input, for printing (output).
This patch doesn't strictly have an equivalent in J.H. patch adding caching
to gitweb.
gitweb/cache.pm | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/gitweb/cache.pm b/gitweb/cache.pm
index d81f6e8..899a4b4 100644
--- a/gitweb/cache.pm
+++ b/gitweb/cache.pm
@@ -399,6 +399,41 @@ sub cache_fetch {
my ($cache, $action) = @_;
my $key = gitweb_output_key();
+ if ($cache->can('compute')) {
+ cache_fetch_compute($cache, $action, $key);
+ } else {
+ cache_fetch_get_set($cache, $action, $key);
+ }
+}
+
+# calculate data to regenerate cache
+sub cache_calculate {
+ my ($action) = @_;
+
+ my $data = cache_capture {
+ $actions{$action}->();
+ };
+
+ return $data;
+}
+
+# for $cache which can ->compute($key, $code)
+sub cache_fetch_compute {
+ my ($cache, $action, $key) = @_;
+
+ my $data = $cache->compute($key, sub { cache_calculate($action) });
+
+ if (defined $data) {
+ # print cached data
+ binmode STDOUT, ':raw';
+ print STDOUT $data;
+ }
+}
+
+# for $cache which can ->get($key) and ->set($key, $data)
+sub cache_fetch_get_set {
+ my ($cache, $action, $key) = @_;
+
my $data = $cache->get($key);
if (defined $data) {
@@ -407,9 +442,7 @@ sub cache_fetch {
print STDOUT $data;
} else {
- $data = cache_capture {
- $actions{$action}->();
- };
+ $data = cache_calculate($action);
if (defined $data) {
$cache->set($key, $data);
--
1.6.6.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html