Changeset 12281

Timestamp:

11/22/09 19:11:54 (14 years ago)

Author:

ehuelsmann

Message:

Fix a memory leak for objects-with-documentation going out of scope,

by making the documentation hash table a WeakHashMap?.

File:

• trunk/abcl/src/org/armedbear/lisp/LispObject.java (modified) (3 diffs)

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

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.util.WeakHashMap;
+
 public class LispObject extends Lisp
 {
@@ -588 +590 @@
   }
 
-  private static final EqHashTable documentationHashTable =
-    new EqHashTable(11, NIL, NIL);
+  private static final WeakHashMap<LispObject, LispObject>
+      documentationHashTable = new WeakHashMap<LispObject, LispObject>();
 
   public LispObject getDocumentation(LispObject docType)
 
   {
-    LispObject alist = documentationHashTable.get(this);
+    LispObject alist;
+    synchronized (documentationHashTable) {
+      alist = documentationHashTable.get(this);
+    }
     if (alist != null)
       {
@@ -607 +612 @@
 
   {
-    LispObject alist = documentationHashTable.get(this);
-    if (alist == null)
-      alist = NIL;
-    LispObject entry = assq(docType, alist);
-    if (entry instanceof Cons)
-      {
-        ((Cons)entry).cdr = documentation;
-      }
-    else
-      {
-        alist = alist.push(new Cons(docType, documentation));
-        documentationHashTable.put(this, alist);
-      }
+    synchronized (documentationHashTable) {
+      LispObject alist = documentationHashTable.get(this);
+      if (alist == null)
+        alist = NIL;
+      LispObject entry = assq(docType, alist);
+      if (entry instanceof Cons)
+        {
+          ((Cons)entry).cdr = documentation;
+        }
+      else
+        {
+          alist = alist.push(new Cons(docType, documentation));
+          documentationHashTable.put(this, alist);
+        }
+    }
   }