From cadef59253f55d4564de9e11df34be2222521be3 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 28 Aug 2003 22:17:37 +0000 Subject: * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added new files. * java/lang/Class.h (_Jv_sharedlib_register_hook): Declare as friend. * java/net/URLClassLoader.java (findClass): Don't use findURLResource. Use loader's getClass method. (URLLoader.getClass): New method. (addURL): Handle `gcjlib' URLs. (SoURLLoader): New class. (SoResource): Likewise. * gnu/gcj/protocol/gcjlib/Connection.java: New file. * gnu/gcj/protocol/gcjlib/Handler.java: New file. * include/jvm.h (struct _Jv_core_chain): Moved from natCore.cc. (_Jv_RegisterCoreHook): Declare. (_Jv_FindCore): Declare. * gnu/gcj/runtime/SharedLibHelper.java: New file. * gnu/gcj/runtime/natSharedLibLoader.cc (CoreHookFunc): New typedef. (core_hook): New function. (struct SharedLibDummy) [saved_core]: New field. (init): Set _Jv_RegisterCoreHook. Throw exception on failure. (register_hook): Set protection domain and class loader on new class. (finalize): Free core chain. * gnu/gcj/Core.java (Core): New constructor. * gnu/gcj/runtime/SharedLibLoader.java: Rewrote to use SharedLibHelper. * gnu/gcj/natCore.cc (_Jv_RegisterResource): Indentation fixlet. (_Jv_create_core): New function. (create): Use it. (default_register_resource): New function. (_Jv_RegisterCoreHook): New global. (_Jv_RegisterResource): Use it. (core_chain_struct): Removed. (_Jv_FindCore): New function. (_Jv_FreeCoreChain): New function. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70892 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/protocol/core/Connection.java | 4 +- libjava/gnu/gcj/protocol/gcjlib/Connection.java | 60 +++++++++++++++++++++++++ libjava/gnu/gcj/protocol/gcjlib/Handler.java | 24 ++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 libjava/gnu/gcj/protocol/gcjlib/Connection.java create mode 100644 libjava/gnu/gcj/protocol/gcjlib/Handler.java (limited to 'libjava/gnu/gcj/protocol') diff --git a/libjava/gnu/gcj/protocol/core/Connection.java b/libjava/gnu/gcj/protocol/core/Connection.java index 5bcbb8611c7..95d709630ac 100644 --- a/libjava/gnu/gcj/protocol/core/Connection.java +++ b/libjava/gnu/gcj/protocol/core/Connection.java @@ -1,6 +1,6 @@ // Connection.java - Implementation of URLConnection for core protocol. -/* Copyright (C) 2001 Free Software Foundation +/* Copyright (C) 2001, 2003 Free Software Foundation This file is part of libgcj. @@ -55,7 +55,7 @@ class Connection extends URLConnection if (! doInput) throw new ProtocolException("Can't open InputStream if doInput is false"); - return new BufferedInputStream(new CoreInputStream (core)); + return new CoreInputStream (core); } // Override default method in URLConnection. diff --git a/libjava/gnu/gcj/protocol/gcjlib/Connection.java b/libjava/gnu/gcj/protocol/gcjlib/Connection.java new file mode 100644 index 00000000000..0b763571f9c --- /dev/null +++ b/libjava/gnu/gcj/protocol/gcjlib/Connection.java @@ -0,0 +1,60 @@ +// Connection.java - Implementation of URLConnection for gcjlib +// protocol. + +/* Copyright (C) 2003 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.gcjlib; +import java.io.*; +import java.net.*; +import gnu.gcj.Core; +import gnu.gcj.protocol.core.CoreInputStream; +import gnu.gcj.runtime.SharedLibHelper; + +/** + * @author Tom Tromey + * @date January 10, 2003 + */ + +class Connection extends URLConnection +{ + String solib; + String name; + Core core; + + public Connection (URL url) throws MalformedURLException + { + super (url); + int index = url.getFile().indexOf("!/"); + if (index == -1) + throw new MalformedURLException("couldn't find !/ in gcjlib URL"); + + name = url.getFile().substring(index + 2); + solib = url.getFile().substring(0, index); + } + + public void connect() throws IOException + { + if (core != null) + return; + // We can't create a new SharedLibHelper here, since we don't know + // what parent class loader to use. + SharedLibHelper helper = SharedLibHelper.findHelper(solib); + if (helper == null) + throw new IOException("library not loaded: " + solib); + core = helper.findCore(name); + if (core == null) + throw new IOException("couldn't find core object: " + name); + } + + public InputStream getInputStream() throws IOException + { + connect(); + return new CoreInputStream(core); + } +} diff --git a/libjava/gnu/gcj/protocol/gcjlib/Handler.java b/libjava/gnu/gcj/protocol/gcjlib/Handler.java new file mode 100644 index 00000000000..fe767cd6ee4 --- /dev/null +++ b/libjava/gnu/gcj/protocol/gcjlib/Handler.java @@ -0,0 +1,24 @@ +// Handler.java - URLStreamHandler for gcjlib protocol. + +/* Copyright (C) 2003 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.gcjlib; + +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.io.IOException; + +public class Handler extends URLStreamHandler +{ + protected URLConnection openConnection(URL url) throws IOException + { + return new Connection(url); + } +} -- cgit v1.2.3