Changeset 11998

Timestamp:

06/06/09 17:46:59 (14 years ago)

Author:

ehuelsmann

Message:

Add a cache for opened '.zip' files.

Before this change, consecutive calls to
loadCompiledFunction() would open the same
zip file over and over.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (5 diffs)
• Load.java (modified) (5 diffs)
• ZipCache.java (added)

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

@@ -1076 +1076 @@
                           }
                         zipFileName = URLDecoder.decode(zipFileName, "UTF-8");
-                        ZipFile zipFile = new ZipFile(zipFileName);
+                        ZipFile zipFile = ZipCache.getZip(zipFileName);
                         try
                           {
@@ -1090 +1090 @@
                         finally
                           {
-                            zipFile.close();
+                            ZipCache.removeZip(zipFile.getName());
                           }
                       }
@@ -1140 +1140 @@
         LispObject loadTruename = Symbol.LOAD_TRUENAME.symbolValue(thread);
         String zipFileName = ((Pathname)loadTruename).getNamestring();
-        ZipFile zipFile = new ZipFile(zipFileName);
+        ZipFile zipFile = ZipCache.getZip(zipFileName);
         try
           {
@@ -1156 +1156 @@
         finally
           {
-            zipFile.close();
+            ZipCache.removeZip(zipFile.getName());
           }
       }
@@ -1198 +1198 @@
         Class c = (new JavaClassLoader()).loadClassFromByteArray(null, bytes, 0, bytes.length);
         if (c != null) {
-            Class sc = c.getSuperclass();
             Constructor constructor = c.getConstructor((Class[])null);
             LispObject obj = (LispObject) constructor.newInstance((Object[])null);

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

@@ -124 +124 @@
         {
             try {
-                zipfile = new ZipFile(file);
+                zipfile = ZipCache.getZip(file.getPath());
             }
             catch (Throwable t) {
@@ -176 +176 @@
             if (in != null) {
                 try {
-                    in.close();
+                   in.close();
                 }
                 catch (IOException e) {
@@ -184 +184 @@
             if (zipfile != null) {
                 try {
-                    zipfile.close();
+                    ZipCache.removeZip(zipfile.getName());
                 }
                 catch (IOException e) {
@@ -266 +266 @@
                         if (ext.equalsIgnoreCase(".abcl")) {
                             try {
-                                zipfile = new ZipFile(file);
+                                zipfile = ZipCache.getZip(file.getPath());
                                 String name = file.getName();
                                 int index = name.lastIndexOf('.');
@@ -339 +339 @@
                 if (zipfile != null) {
                     try {
-                        zipfile.close();
+                        ZipCache.removeZip(zipfile.getName());
                     }
                     catch (IOException e) {