Changeset 14627

Timestamp:

02/16/14 21:25:20 (10 years ago)

Author:

Mark Evenson

Message:

(partially) restore CL:LOAD from jar files.

There is apparently a fair amount of "breakage" of cases that used to
load no longer working which seems due to the changes in the semantics
for finding the FASL init loader. The following tests are now broken
but no longer cause the JVM to crash: JAR-PATHNAME.LOAD.HTTP.1,
JAR-PATHNAME.LOAD.HTTP.2, JAR-PATHNAME.LOAD.HTTP.4,
JAR-PATHNAME.LOAD.HTTP.6, JAR-PATHNAME.LOAD.HTTP.7,
and JAR-PATHNAME.LOAD.HTTP.9. Need to follow this up in subsequent work.

Fixed the underlying HttpHead?.get() interface used to determine
whether to used a cache version. The custom HTTP HEAD code that was
working under Java 6 no longer worked on Java 7.

Added to HttpHead?.get() asynchronous java.lang.Throwable on a socket
timeout of 5000 ms.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Debug.java (modified) (2 diffs)
• src/org/armedbear/lisp/ZipCache.java (modified) (1 diff)
• src/org/armedbear/lisp/util/HttpHead.java (modified) (7 diffs)
• test/lisp/abcl/jar-pathname.lisp (modified) (2 diffs)
• test/src/org/armedbear/lisp/util/HttpHeadTest.java (modified) (3 diffs)

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

@@ -87 +87 @@
     }
 
+    @SuppressWarnings("CallToThreadDumpStack")
     public static final void trace(Throwable t)
     {
@@ -92 +93 @@
     }
 
+    public static final void trace(String message, Throwable t)
+    {
+       trace(message);
+       trace(t);
+    }
     public static final Symbol _DEBUG_WARN_
         = exportSpecial("*DEBUG-WARN*", PACKAGE_SYS, NIL);

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

@@ -165 +165 @@
                 // headers, which if we don't find, we give up and
                 // refetch the resource.
-                String dateString = HttpHead.get(url, "Last-Modified");
+                String dateString = null;
+                try {
+                  dateString = HttpHead.get(url, "Last-Modified");
+                } catch (IOException ex) {
+                  Debug.trace(ex);
+                }
                 Date date = null;
                 ParsePosition pos = new ParsePosition(0);

trunk/abcl/src/org/armedbear/lisp/util/HttpHead.java

@@ -38 +38 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.InetSocketAddress;
@@ -49 +50 @@
  */
 public class HttpHead {
-    static private String get(String urlString, String key) {
+    static private String get(String urlString, String key) throws IOException {
         URL url = null;
         try {
@@ -59 +60 @@
     }
 
-    static public String get(URL url, String key) {
+    static public String get(URL url, String key) throws IOException {
         Socket socket = null;
         String result = null;
@@ -68 +69 @@
                 return result;
             }
-
-            socket = new Socket(Proxy.NO_PROXY); // XXX add Proxy
-
+            String host = url.getHost();
             int port = url.getPort();
             if (port == -1) {
                 port = 80;
             }
-            InetSocketAddress address = new InetSocketAddress(url.getHost(), port);
-            try {
-                socket.connect(address, 5000); // ??? too long?  too short?
-            } catch (IOException ex) {
-                log("Connection failed: " + ex);
-                return result;
-            }
-
+            socket = new Socket(host, port);
+           
             PrintWriter out = null;
             BufferedReader in = null;
             try {
                 socket.setSoTimeout(5000); // ms
-                out = new PrintWriter(socket.getOutputStream());
+                out = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()), true);
                 in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             } catch (IOException e) {
@@ -94 +87 @@
             }
 
+            String CRLF = "\r\n";
             String head = "HEAD " + url.getPath() + " HTTP/1.1";
-            out.println(head);
-            out.println("Host: " + url.getAuthority());
-            out.println("Connection: close");
-            out.println("");
+            out.print(head + CRLF);
+            out.print("Host: " + url.getAuthority() + CRLF);
+            out.print("Connection: close" + CRLF);
+            out.print(CRLF);
             out.flush();
 
@@ -106 +100 @@
             } catch (IOException e) {
                 log("Failed to read HTTP response: " + e);
+            }
+            if (line == null) {
+              throw new IOException("Could not access URL to parse headers."); 
             }
             String status[] = line.split("\\s");
@@ -155 +152 @@
 
     public static void main(String argv[]) {
-        if (argv.length != 1) {
-            System.out.println("Usage: <cmd> URL");
-            return;
-        }
-        String modified = get(argv[0], "Last-Modified");
-        if (modified != null) {
-            System.out.println("Last-Modified: " + modified);
-        } else {
-            System.out.println("No result returned.");
-        }
+      if (argv.length != 1) {
+        System.out.println("Usage: <cmd> URL");
+        return;
+      }
+      String modified = null;
+      try {
+        modified = get(argv[0], "Last-Modified");
+      } catch (IOException ex) {
+        System.err.println("Unable to get Last-Modified header: ");
+        ex.printStackTrace(System.err);
+      }
+      if (modified != null) {
+        System.out.println("Last-Modified: " + modified);
+      } else {
+        System.out.println("No result returned.");
+      }
     }
 }

trunk/abcl/test/lisp/abcl/jar-pathname.lisp

@@ -150 +150 @@
   t)
 
-çu(deftest jar-pathname.load.5
+(deftest jar-pathname.load.5
     (load-from-jar *tmp-jar-path* "eek.lisp")
   t)
@@ -210 +210 @@
 
 ;;; wrapped in PROGN for easy disabling without a network connection
-;;; XXX come up with a better abstraction
-
-;; disable until fix loading fasls via HTTP 
-#+nil  Bombs JVM!  --ME 20140126
 (progn 
   (deftest jar-pathname.load.http.1

trunk/abcl/test/src/org/armedbear/lisp/util/HttpHeadTest.java

@@ -1 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package org.armedbear.lisp.util;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -18 +13 @@
 import static org.junit.Assert.*;
 
-/**
- *
- * @author evenson
- */
 public class HttpHeadTest {
   
@@ -43 +34 @@
   }
 
-  /**
-   * Test of get method, of class HttpHead.
-   */
   @Test
   public void testGet() {
-    System.out.println("get");
     URL url = null;
     try {
-      url = new URL("http://abcl-dynamic-install.googlecode.com/files/baz-20130403a.jar");
+      url = new URL("http://abcl.org/fasl/42/baz-20140105a-fasl-42.jar");
     } catch (MalformedURLException ex) {
       Logger.getLogger(HttpHeadTest.class.getName()).log(Level.SEVERE, null, ex);
     }
     String key = "Last-Modified";
-    String expResult = "";
-    String result = HttpHead.get(url, key);
-    assertEquals(expResult, result);
-    System.out.println("Last-Modifed result was "+ result);
-    fail("The test case is a prototype.");
+    String result = null;
+    try {
+      result = HttpHead.get(url, key);
+    } catch (IOException ex) {
+      Logger.getLogger(HttpHeadTest.class.getName()).log(Level.SEVERE, null, ex);
+    }
+    assertNotNull(result);
+    System.out.println("Last-Modified result was "+ result);
   }
 
-  /**
-   * Test of main method, of class HttpHead.
-   */
   @Test
   public void testMain() {
     System.out.println("main");
-    String[] argv = null;
+    String[] argv = {"http://google.com/"};
     HttpHead.main(argv);
-    // TODO review the generated test code and remove the default call to fail.
-    fail("The test case is a prototype.");
   }