Changeset 12957

Timestamp:

10/08/10 18:43:36 (13 years ago)

Author:

ehuelsmann

Message:

Use a synchronized hash table with weak keys to allow
garbage collection of the symbols in it - and of the function_info
with the symbols as soon as they disappear.

File:

• trunk/abcl/src/org/armedbear/lisp/function_info.java (modified) (6 diffs)

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

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.util.Map;
+import java.util.Collections;
+import java.util.WeakHashMap;
 import static org.armedbear.lisp.Lisp.*;
 
 public final class function_info
 {
-    static EqualHashTable FUNCTION_TABLE =
-        new EqualHashTable(64, NIL, NIL);
+    // ### TODO: Replace by a concurrent hashmap, with weak keys, ofcourse.
+    final static Map<LispObject,LispObject> symbolToFunctionMap =
+        Collections.synchronizedMap(new WeakHashMap());
 
     // ### function-info name
@@ -48 +52 @@
         public LispObject execute(LispObject arg)
         {
-            LispObject info = FUNCTION_TABLE.get(arg);
+            LispObject info = symbolToFunctionMap.get(arg);
             return info != null ? info : NIL;
         }
@@ -62 +66 @@
         {
             if (info == NIL)
-                FUNCTION_TABLE.remhash(name);
+                symbolToFunctionMap.remove(name);
             else
-                FUNCTION_TABLE.put(name, info);
+                symbolToFunctionMap.put(name, info);
             return info;
         }
@@ -79 +83 @@
         {
             // info is an alist
-            LispObject info = FUNCTION_TABLE.get(name);
+            LispObject info = symbolToFunctionMap.get(name);
             if (info != null) {
                 while (info != NIL) {
@@ -108 +112 @@
         {
             // info is an alist
-            LispObject info = FUNCTION_TABLE.get(name);
+            LispObject info = symbolToFunctionMap.get(name);
             if (info == null)
                 info = NIL;
@@ -125 +129 @@
             }
             // Not found.
-            FUNCTION_TABLE.put(name, info.push(new Cons(indicator, value)));
+            symbolToFunctionMap.put(name, info.push(new Cons(indicator, value)));
             return value;
         }