cache_method 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.2.5 / 2012-04-24
+
+* Enhancements
+
+  * If you immediately obtain the fetch mutex, don't double-get because for all you know you're the first setter
+  * Better debug logging (require 'cache_method/debug')
+
 0.2.4 / 2012-04-17
 
 * Enhancements

data/lib/cache_method/cached_result.rb

@@ -26,8 +26,18 @@ module CacheMethod
       if wrapped_v = get_wrapped
         wrapped_v.first
       else
-        @fetch_mutex.synchronize do
-          (get_wrapped || set_wrapped).first
+        if @fetch_mutex.try_lock
+          # i got the lock, so don't bother trying to get first
+          begin
+            set_wrapped.first
+          ensure
+            @fetch_mutex.unlock
+          end
+        else
+          # i didn't get the lock, so get in line, and do try to get first
+          @fetch_mutex.synchronize do
+            (get_wrapped || set_wrapped).first
+          end
         end
       end
     end

data/lib/cache_method/debug.rb

@@ -1,8 +1,34 @@
 module CacheMethod
   def CacheMethod.digest(obj)
     if (l = ::Marshal.dump(resolve_cache_key(obj)).length) > 500
-      $stderr.puts "[cache_method] Warn: #{l} long digest. #{obj.class} -> #{resolve_cache_key(obj).inspect}"
+      $stderr.puts "[cache_method] DIGEST (long?): #{resolve_cache_key(obj).inspect}"
     end
     ::Digest::SHA1.hexdigest ::Marshal.dump(resolve_cache_key(obj))
   end
+
+  class CachedResult
+    def debug_get_wrapped
+      retval = original_get_wrapped
+      if retval
+        # $stderr.puts "[cache_method] GET: #{method_signature}(#{args.inspect})"
+      else
+        $stderr.puts "[cache_method] GET (miss!): #{method_signature}(#{args.inspect})"
+      end
+      retval
+    end
+    alias :original_get_wrapped :get_wrapped
+    alias :get_wrapped :debug_get_wrapped
+
+    def debug_set_wrapped
+      retval = original_set_wrapped
+      if (l = ::Marshal.dump(retval).length > 1000)
+        $stderr.puts "[cache_method] SET (long?): #{method_signature}(#{args.inspect}) -> #{retval.inspect}"
+      else
+        # $stderr.puts "[cache_method] SET: #{method_signature}(#{args.inspect})"
+      end
+      retval
+    end
+    alias :original_set_wrapped :set_wrapped
+    alias :set_wrapped :debug_set_wrapped
+  end
 end

data/lib/cache_method/version.rb

@@ -1,3 +1,3 @@
 module CacheMethod
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_method
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cache