Java runtime patch: compile resource files into executables
Anthony Green
green@redhat.com
Sun Sep 2 18:08:00 GMT 2001
These gcj runtime changes are used with this compiler patch:
http://gcc.gnu.org/ml/gcc-patches/2001-09/msg00026.html
This patch introduces the "core" protocol handler. This is useful for
binding resource files to executables.
I've also forced "core:/" to the end of the classpath so compiled-in
property files and such will be loaded properly by the runtime.
Ok?
Sun Sep 2 17:57:33 2001 Anthony Green <green@redhat.com>
* gnu/gcj/Core.java, gnu/gcj/natCore.cc,
gnu/gcj/protocol/core/Connection.java,
gnu/gcj/protocol/core/Handler.java,
gnu/gcj/protocol/core/CoreInputStream.java,
gnu/gcj/protocol/core/natCoreInputStream.cc: New files.
* java/net/URL.java (setURLStreamHandler): Use
gnu.gcj.protocol.core.Handler for the core protocol.
* gnu/gcj/runtime/VMClassLoader.java (init): Add "core:/" to the
end of java.class.path.
* Makefile.am (ordinary_java_source_files): Add new java files.
(nat_source_files): Add new native code files.
* Makefile.in: Rebuilt.
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile.am
--- Makefile.am 2001/08/31 21:31:16 1.164
+++ Makefile.am 2001/09/03 01:01:46
@@ -1107,11 +1107,15 @@ java/util/WeakHashMap.java
## awt_java_source_files. If the .java file has a hand-maintained
## header, please list it in special_java_source_files.
ordinary_java_source_files = $(core_java_source_files) \
+gnu/gcj/Core.java \
gnu/gcj/RawData.java \
gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java \
gnu/gcj/math/MPN.java \
+gnu/gcj/protocol/core/Connection.java \
+gnu/gcj/protocol/core/Handler.java \
+gnu/gcj/protocol/core/CoreInputStream.java \
gnu/gcj/protocol/file/Connection.java \
gnu/gcj/protocol/file/Handler.java \
gnu/gcj/protocol/http/Connection.java \
@@ -1455,6 +1459,7 @@ c_source_files = \
## This lists all the C++ source files in subdirectories.
nat_source_files = \
+gnu/gcj/natCore.cc \
gnu/gcj/convert/JIS0208_to_Unicode.cc \
gnu/gcj/convert/JIS0212_to_Unicode.cc \
gnu/gcj/convert/Unicode_to_JIS.cc \
@@ -1465,6 +1470,7 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \
+gnu/gcj/protocol/core/natCoreInputStream.cc \
gnu/gcj/runtime/natFirstThread.cc \
java/io/natFile.cc \
java/io/natFileDescriptor.cc \
Index: libjava/gnu/gcj/Core.java
===================================================================
RCS file: Core.java
diff -N Core.java
--- /dev/null Tue May 5 13:32:27 1998
+++ Core.java Sun Sep 2 18:01:46 2001
@@ -0,0 +1,18 @@
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package gnu.gcj;
+
+public class Core
+{
+ public native static Core create (String name) throws java.io.IOException;
+
+ public RawData ptr;
+ public int length;
+}
+
Index: libjava/gnu/gcj/natCore.cc
===================================================================
RCS file: natCore.cc
diff -N natCore.cc
--- /dev/null Tue May 5 13:32:27 1998
+++ natCore.cc Sun Sep 2 18:01:46 2001
@@ -0,0 +1,85 @@
+// natCore -- C++ side of Core
+
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+/* Author: Anthony Green <green@redhat.com>. */
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <string.h>
+
+#include <java/lang/NullPointerException.h>
+#include <java/io/IOException.h>
+#include <gnu/gcj/Core.h>
+
+typedef struct core_chain_struct
+{
+ int name_length;
+ char *name;
+ int data_length;
+ char *data;
+
+ struct core_chain_struct *next;
+} core_chain;
+
+static core_chain *root;
+#include <stdio.h>
+void _Jv_RegisterResource (void *vptr)
+{
+ char *rptr = (char *)vptr;
+ // While not strictly pointer free, none of the pointers point to
+ // anything the GC cares about, so allocate a pointer free block.
+ core_chain *cc = (core_chain *) _Jv_AllocBytes (sizeof (core_chain));
+
+ cc->name_length = ((int *)rptr)[0];
+ cc->data_length = ((int *)rptr)[1];
+ cc->name = rptr + 2*sizeof(int);
+ cc->data = cc->name + cc->name_length;
+
+ {
+ char n[1064];
+ strncpy (n, cc->name, cc->name_length);
+ n[cc->name_length] = 0;
+ printf ("registering %s with length of %d.\n", n, cc->data_length);
+ }
+
+ // Add this new item to the chain...
+ core_chain *old_root = root;
+ cc->next = old_root;
+ root = cc;
+}
+
+gnu::gcj::Core *
+gnu::gcj::Core::create (jstring name)
+{
+ char buf[1064];
+ jsize total = JvGetStringUTFRegion (name, 0, name->length(), buf);
+ buf[total] = '\0';
+
+ core_chain *node = root;
+ while (node)
+ {
+ if (total == node->name_length
+ && strncmp (buf, node->name, total) == 0)
+ {
+ gnu::gcj::Core *core =
+ (gnu::gcj::Core *) _Jv_AllocObject(&gnu::gcj::Core::class$,
+ sizeof (gnu::gcj::Core));
+ core->ptr = (gnu::gcj::RawData *) node->data;
+ core->length = node->data_length;
+ return core;
+ }
+ else
+ node = node->next;
+ }
+
+ throw new java::io::IOException (JvNewStringLatin1 ("can't open core"));
+}
Index: libjava/gnu/gcj/protocol/core/Connection.java
===================================================================
RCS file: Connection.java
diff -N Connection.java
--- /dev/null Tue May 5 13:32:27 1998
+++ Connection.java Sun Sep 2 18:01:46 2001
@@ -0,0 +1,154 @@
+// Connection.java - Implementation of URLConnection for core protocol.
+
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package gnu.gcj.protocol.core;
+
+import gnu.gcj.Core;
+import java.net.*;
+import java.io.*;
+import java.util.Vector;
+import java.util.Hashtable;
+import java.util.Enumeration;
+
+/**
+ * @author Anthony Green <green@redhat.com>
+ * @date August 13, 2001
+ */
+
+class Connection extends URLConnection
+{
+ private Hashtable hdrHash = new Hashtable();
+ private Vector hdrVec = new Vector();
+ private boolean gotHeaders = false;
+
+ private Core core;
+
+ public Connection(URL url)
+ {
+ super(url);
+ }
+
+ // Implementation of abstract method.
+ public void connect() throws IOException
+ {
+ // Call is ignored if already connected.
+ if (connected)
+ return;
+
+ // If not connected, then file needs to be opened.
+ core = Core.create (url.getFile());
+ connected = true;
+ }
+
+ public InputStream getInputStream() throws IOException
+ {
+ if (!connected)
+ connect();
+
+ if (! doInput)
+ throw new ProtocolException("Can't open InputStream if doInput is false");
+ return new BufferedInputStream(new CoreInputStream (core));
+ }
+
+ // Override default method in URLConnection.
+ public String getHeaderField(String name)
+ {
+ try
+ {
+ getHeaders();
+ }
+ catch (IOException x)
+ {
+ return null;
+ }
+ return (String) hdrHash.get(name.toLowerCase());
+ }
+
+ // Override default method in URLConnection.
+ public String getHeaderField(int n)
+ {
+ try
+ {
+ getHeaders();
+ }
+ catch (IOException x)
+ {
+ return null;
+ }
+ if (n < hdrVec.size())
+ return getField((String) hdrVec.elementAt(n));
+
+ return null;
+ }
+
+ // Override default method in URLConnection.
+ public String getHeaderFieldKey(int n)
+ {
+ try
+ {
+ getHeaders();
+ }
+ catch (IOException x)
+ {
+ return null;
+ }
+ if (n < hdrVec.size())
+ return getKey((String) hdrVec.elementAt(n));
+
+ return null;
+ }
+
+ private String getKey(String str)
+ {
+ if (str == null)
+ return null;
+ int index = str.indexOf(':');
+ if (index >= 0)
+ return str.substring(0, index);
+ else
+ return null;
+ }
+
+ private String getField(String str)
+ {
+ if (str == null)
+ return null;
+ int index = str.indexOf(':');
+ if (index >= 0)
+ return str.substring(index + 1).trim();
+ else
+ return str;
+ }
+
+ private void getHeaders() throws IOException
+ {
+ if (gotHeaders)
+ return;
+ gotHeaders = true;
+
+ connect();
+
+ // Yes, it is overkill to use the hash table and vector here since
+ // we're only putting one header in the file, but in case we need
+ // to add others later and for consistency, we'll implement it this way.
+
+ // Add the only header we know about right now: Content-length.
+ long len = core.length;
+ String line = "Content-length: " + len;
+ hdrVec.addElement(line);
+
+ // The key will never be null in this scenario since we build up the
+ // headers ourselves. If we ever rely on getting a header from somewhere
+ // else, then we may have to check if the result of getKey() is null.
+ String key = getKey(line);
+ hdrHash.put(key.toLowerCase(), Long.toString(len));
+ }
+}
+
Index: libjava/gnu/gcj/protocol/core/CoreInputStream.java
===================================================================
RCS file: CoreInputStream.java
diff -N CoreInputStream.java
--- /dev/null Tue May 5 13:32:27 1998
+++ CoreInputStream.java Sun Sep 2 18:01:46 2001
@@ -0,0 +1,90 @@
+// Handler.java - URLStreamHandler for core protocol.
+
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package gnu.gcj.protocol.core;
+
+import java.io.*;
+import gnu.gcj.Core;
+import gnu.gcj.RawData;
+
+public class CoreInputStream extends InputStream
+{
+ /* A pointer to the object in memory. */
+ protected RawData ptr;
+
+ /* Position of the next byte in core to be read. */
+ protected int pos;
+
+ /* The currently marked position in the stream. */
+ protected int mark;
+
+ /* The index in core one greater than the last valid character. */
+ protected int count;
+
+ private native void init (String coreObjectName);
+ private native int unsafeGetByte (long offset);
+ private native int copyIntoByteArray (byte[] dest, int offset, int numBytes);
+
+ public CoreInputStream (Core core)
+ {
+ ptr = core.ptr;
+ count = core.length;
+ }
+
+ public synchronized int available()
+ {
+ return count - pos;
+ }
+
+ public synchronized void mark(int readAheadLimit)
+ {
+ // readAheadLimit is ignored per Java Class Lib. book, p.220.
+ mark = pos;
+ }
+
+ public boolean markSupported()
+ {
+ return true;
+ }
+
+ public synchronized int read()
+ {
+ if (pos < count)
+ return ((int) unsafeGetByte(pos++)) & 0xFF;
+ return -1;
+ }
+
+ public synchronized int read(byte[] b, int off, int len)
+ {
+ if (pos >= count)
+ return -1;
+
+ int numBytes = Math.min(count - pos, len);
+ copyIntoByteArray (b, off, numBytes);
+ pos += numBytes;
+ return numBytes;
+ }
+
+ public synchronized void reset()
+ {
+ pos = mark;
+ }
+
+ public synchronized long skip(long n)
+ {
+ // Even though the var numBytes is a long, in reality it can never
+ // be larger than an int since the result of subtracting 2 positive
+ // ints will always fit in an int. Since we have to return a long
+ // anyway, numBytes might as well just be a long.
+ long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
+ pos += numBytes;
+ return numBytes;
+ }
+}
Index: libjava/gnu/gcj/protocol/core/Handler.java
===================================================================
RCS file: Handler.java
diff -N Handler.java
--- /dev/null Tue May 5 13:32:27 1998
+++ Handler.java Sun Sep 2 18:01:46 2001
@@ -0,0 +1,29 @@
+// Handler.java - URLStreamHandler for core protocol.
+
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package gnu.gcj.protocol.core;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.io.IOException;
+
+/**
+ * @author Anthony Green <green@redhat.com>
+ * @date August 13, 2001.
+ */
+
+public class Handler extends URLStreamHandler
+{
+ protected URLConnection openConnection(URL url) throws IOException
+ {
+ return new Connection(url);
+ }
+}
Index: libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
===================================================================
RCS file: natCoreInputStream.cc
diff -N natCoreInputStream.cc
--- /dev/null Tue May 5 13:32:27 1998
+++ natCoreInputStream.cc Sun Sep 2 18:01:46 2001
@@ -0,0 +1,49 @@
+// natCoreInputStream.cc -- C++ side of CoreInputStream
+
+/* Copyright (C) 2001 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+/* Author: Anthony Green <green@redhat.com>. */
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <string.h>
+
+#include <java/lang/NullPointerException.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <gnu/gcj/protocol/core/CoreInputStream.h>
+
+jint
+gnu::gcj::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
+{
+ return ((char *)ptr)[offset];
+}
+
+jint
+gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
+ jint offset,
+ jint numBytes)
+{
+ if (! dest)
+ throw new java::lang::NullPointerException;
+ jsize destSize = JvGetArrayLength (dest);
+ if (offset < 0 || numBytes < 0 || offset + numBytes < 0
+ || offset + numBytes > destSize
+ || pos + numBytes > count)
+ throw new java::lang::ArrayIndexOutOfBoundsException;
+
+ void *pcore = (void *) &((char*)ptr)[pos];
+ void *pdest = (void *) (elements (dest) + offset);
+
+ memcpy (pdest, pcore, numBytes);
+
+ return 0;
+}
+
Index: libjava/gnu/gcj/runtime/VMClassLoader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/runtime/VMClassLoader.java,v
retrieving revision 1.7
diff -u -p -r1.7 VMClassLoader.java
--- VMClassLoader.java 2001/05/21 19:27:10 1.7
+++ VMClassLoader.java 2001/09/03 01:01:46
@@ -56,6 +56,16 @@ public final class VMClassLoader extends
/* Ignore this path element */
}
}
+ // Add core:/ to the end of the java.class.path so any resources
+ // compiled into this executable may be found.
+ try
+ {
+ p.addElement (new URL("core", "", -1, "/"));
+ }
+ catch (java.net.MalformedURLException x)
+ {
+ // This should never happen.
+ }
URL[] urls = new URL[p.size()];
p.copyInto (urls);
Index: libjava/java/net/URL.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URL.java,v
retrieving revision 1.7
diff -u -p -r1.7 URL.java
--- URL.java 2000/09/08 19:37:09 1.7
+++ URL.java 2001/09/03 01:01:46
@@ -339,6 +339,10 @@ public final class URL implements Serial
// If a non-default factory has been set, use it to find the protocol.
if (factory != null)
handler = factory.createURLStreamHandler(protocol);
+ else if (protocol.equals ("core"))
+ {
+ handler = new gnu.gcj.protocol.core.Handler ();
+ }
else if (protocol.equals ("file"))
{
// This is an interesting case. It's tempting to think that we
More information about the Java-patches
mailing list