Changeset 14491

Timestamp:

05/05/13 12:16:07 (10 years ago)

Author:

rschlatte

Message:

Always initialize emf cache for generic functions

Eliminates a check from generic function invocation critical path.

File:

• trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java

@@ -41 +41 @@
 {
 
-  ConcurrentHashMap<CacheEntry,LispObject> cache;
+  ConcurrentHashMap<CacheEntry,LispObject> cache
+    = new ConcurrentHashMap<CacheEntry,LispObject>();;
 
   public StandardGenericFunction()
@@ -67 +68 @@
   void clearCache()
   {
-    cache = null;
+    cache = new ConcurrentHashMap<CacheEntry,LispObject>();
   }
 
@@ -160 +161 @@
       CacheEntry specializations = new CacheEntry(array);
       ConcurrentHashMap<CacheEntry,LispObject> ht = gf.cache;
-      if (ht == null)
-        ht = gf.cache = new ConcurrentHashMap<CacheEntry,LispObject>();
       ht.put(specializations, third);
       return third;
@@ -191 +190 @@
       CacheEntry specializations = new CacheEntry(array);
       ConcurrentHashMap<CacheEntry,LispObject> ht = gf.cache;
-      if (ht == null)
-        return NIL;
       LispObject emf = (LispObject) ht.get(specializations);
       return emf != null ? emf : NIL;