ChangeLog: Previous java/io, java/nio, gnu/java/nio and related changes.
* Makefile.am, configure.in: Updated accordingly. From-SVN: r78666
This commit is contained in:
Per Bothner
Per Bothner
parent
881ad9e405
commit
76c88fd97b
|
|
@ -1,3 +1,53 @@
|
|||
2004-02-29 Per Bothner <per@bothner.com>
|
||||
|
||||
* java/nio/channels/FileChannelImpl.java: Moved to package
|
||||
gnu/java/nio/channels, since we need to refer to it from java.io.
|
||||
* java/nio/channels/natFileChannelImpl.cc: Removed file.
|
||||
* gnu/java/nio/channels/FileChannelImpl.java: New class, renamed
|
||||
from java/nio/channels. Don't depend on FileDescriptor.
|
||||
(in, out, err): New static fields.
|
||||
(mode): New field.
|
||||
(SET, CUR, READ, WRITE, APPEND, EXCL, SYNC, DSYNC): Moved constants
|
||||
from FileDescriptor.
|
||||
(by): Removed MappedByteBuffer field.
|
||||
(map): New working implementation.
|
||||
* gnu/java/nio/channels/natFileChannelPosix.cc: New file, though
|
||||
some code "ported" from natFileDescriptoPosix.cc.
|
||||
* gnu/java/nio/channels/natFileChannelEcos.cc: Likewise.
|
||||
* gnu/java/nio/channels/natFileChannelWin32.cc Likewise.
|
||||
* java/io/FileDescriptor.java: Implement on top of FileChannel.
|
||||
Remove native methods.
|
||||
* Makefile.am, configure.in: Updated accordingly.
|
||||
|
||||
* gnu/java/nio/FileLockImpl.java (fd): Remove field, replacing it by:
|
||||
(ch): New FileChannelImpl field. Update constructor to match.
|
||||
(releaseImpl): Remove native method. Instead ...
|
||||
(release): Call unlock on channel.
|
||||
* gnu/java/nio/natFileLockImpl.cc: Removed file.
|
||||
|
||||
* java/io/natFileDescriptorEcos.cc: Remove file.
|
||||
* java/io/natFileDescriptorPosix.cc: Remove file.
|
||||
* java/io/natFileDescriptorWin32.cc: Remove file.
|
||||
* java/io/FileInputStream.java (ch): Change type to FileChannelImpl.
|
||||
(<init>(File)): Allocate a FileChannelImpl, not a FileDescriptor.
|
||||
(<init>(FileChannelImpl)): New package-private constructor.
|
||||
(<init>(FileDescriptor)): Extract FileChannelImpl from arg.
|
||||
(available, close, read, skip): Implement using FileChannelImpl.
|
||||
(getFD): Allocate FileDescriptor if needed.
|
||||
(getChannel): Is now trivial.
|
||||
* java/io/FileOutputStream.java: Corresponding changes.
|
||||
* java/io/RandomAccessFile.java: Corresponding changes.
|
||||
|
||||
* java/nio/MappedByteBuffer.java: (forceImpl, isLoadedImpl, loadImpl,
|
||||
unmapImpl): New dummy methods, to be overridden by subclass.
|
||||
(finalize, isLoaded, load, force): New methods.
|
||||
* java/nio/MappedByteBufferImpl.java: More-or-less rewrite.
|
||||
Now works, at least for read mapping.
|
||||
|
||||
* java/lang/natPosixProcess.cc (startProcess): Implement standard
|
||||
streams using FileChannelImpl, not FileDescriptor.
|
||||
* java/lang/natWin32Process.cc (startProcess): Likewise.
|
||||
|
||||
2004-02-28 Michael Koch <konqueror@gmx.de>
|
||||
|
||||
* java/io/ObjectInputStream.java: Compile fix, damn I commited the
|
||||
|
|
@ -55,6 +105,7 @@
|
|||
* Makefile.am: Generate and install headers for inner classes in
|
||||
java.nio.channels.Pipe and gnu.java.nio.PipeImpl.
|
||||
* Makefile.in: Regenerated.
|
||||
|
||||
2004-02-24 Anthony Green <green@redhat.com>
|
||||
|
||||
* java/lang/StringBuffer.java: No need to NULL out remainder of
|
||||
|
|
|
|||
|
|
@ -2358,6 +2358,7 @@ gnu/java/nio/ServerSocketChannelImpl.java \
|
|||
gnu/java/nio/ServerSocketChannelSelectionKey.java \
|
||||
gnu/java/nio/SocketChannelImpl.java \
|
||||
gnu/java/nio/SocketChannelSelectionKey.java \
|
||||
gnu/java/nio/channels/FileChannelImpl.java \
|
||||
gnu/java/nio/charset/ISO_8859_1.java \
|
||||
gnu/java/nio/charset/Provider.java \
|
||||
gnu/java/nio/charset/US_ASCII.java \
|
||||
|
|
@ -2510,7 +2511,6 @@ java/nio/channels/ClosedSelectorException.java \
|
|||
java/nio/channels/ConnectionPendingException.java \
|
||||
java/nio/channels/DatagramChannel.java \
|
||||
java/nio/channels/FileChannel.java \
|
||||
java/nio/channels/FileChannelImpl.java \
|
||||
java/nio/channels/FileLock.java \
|
||||
java/nio/channels/FileLockInterruptionException.java \
|
||||
java/nio/channels/GatheringByteChannel.java \
|
||||
|
|
@ -2822,12 +2822,11 @@ gnu/java/awt/natEmbeddedWindow.cc \
|
|||
gnu/java/net/natPlainDatagramSocketImpl.cc \
|
||||
gnu/java/net/natPlainSocketImpl.cc \
|
||||
gnu/java/net/protocol/core/natCoreInputStream.cc \
|
||||
gnu/java/nio/natFileLockImpl.cc \
|
||||
gnu/java/nio/natPipeImpl.cc \
|
||||
gnu/java/nio/natSelectorImpl.cc \
|
||||
gnu/java/nio/natNIOServerSocket.cc \
|
||||
gnu/java/nio/channels/natFileChannelImpl.cc \
|
||||
java/io/natFile.cc \
|
||||
java/io/natFileDescriptor.cc \
|
||||
java/io/natObjectInputStream.cc \
|
||||
java/io/natVMObjectStreamClass.cc \
|
||||
java/lang/natCharacter.cc \
|
||||
|
|
@ -2854,7 +2853,6 @@ java/lang/reflect/natProxy.cc \
|
|||
java/net/natNetworkInterface.cc \
|
||||
java/net/natInetAddress.cc \
|
||||
java/nio/natDirectByteBufferImpl.cc \
|
||||
java/nio/channels/natFileChannelImpl.cc \
|
||||
java/text/natCollator.cc \
|
||||
java/util/natResourceBundle.cc \
|
||||
java/util/natTimeZone.cc \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -2036,6 +2036,7 @@ gnu/java/nio/ServerSocketChannelImpl.java \
|
|||
gnu/java/nio/ServerSocketChannelSelectionKey.java \
|
||||
gnu/java/nio/SocketChannelImpl.java \
|
||||
gnu/java/nio/SocketChannelSelectionKey.java \
|
||||
gnu/java/nio/channels/FileChannelImpl.java \
|
||||
gnu/java/nio/charset/ISO_8859_1.java \
|
||||
gnu/java/nio/charset/Provider.java \
|
||||
gnu/java/nio/charset/US_ASCII.java \
|
||||
|
|
@ -2188,7 +2189,6 @@ java/nio/channels/ClosedSelectorException.java \
|
|||
java/nio/channels/ConnectionPendingException.java \
|
||||
java/nio/channels/DatagramChannel.java \
|
||||
java/nio/channels/FileChannel.java \
|
||||
java/nio/channels/FileChannelImpl.java \
|
||||
java/nio/channels/FileLock.java \
|
||||
java/nio/channels/FileLockInterruptionException.java \
|
||||
java/nio/channels/GatheringByteChannel.java \
|
||||
|
|
@ -2499,12 +2499,11 @@ gnu/java/awt/natEmbeddedWindow.cc \
|
|||
gnu/java/net/natPlainDatagramSocketImpl.cc \
|
||||
gnu/java/net/natPlainSocketImpl.cc \
|
||||
gnu/java/net/protocol/core/natCoreInputStream.cc \
|
||||
gnu/java/nio/natFileLockImpl.cc \
|
||||
gnu/java/nio/natPipeImpl.cc \
|
||||
gnu/java/nio/natSelectorImpl.cc \
|
||||
gnu/java/nio/natNIOServerSocket.cc \
|
||||
gnu/java/nio/channels/natFileChannelImpl.cc \
|
||||
java/io/natFile.cc \
|
||||
java/io/natFileDescriptor.cc \
|
||||
java/io/natObjectInputStream.cc \
|
||||
java/io/natVMObjectStreamClass.cc \
|
||||
java/lang/natCharacter.cc \
|
||||
|
|
@ -2531,7 +2530,6 @@ java/lang/reflect/natProxy.cc \
|
|||
java/net/natNetworkInterface.cc \
|
||||
java/net/natInetAddress.cc \
|
||||
java/nio/natDirectByteBufferImpl.cc \
|
||||
java/nio/channels/natFileChannelImpl.cc \
|
||||
java/text/natCollator.cc \
|
||||
java/util/natResourceBundle.cc \
|
||||
java/util/natTimeZone.cc \
|
||||
|
|
@ -2681,9 +2679,9 @@ gnu/java/awt/natEmbeddedWindow.lo \
|
|||
gnu/java/net/natPlainDatagramSocketImpl.lo \
|
||||
gnu/java/net/natPlainSocketImpl.lo \
|
||||
gnu/java/net/protocol/core/natCoreInputStream.lo \
|
||||
gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natPipeImpl.lo \
|
||||
gnu/java/nio/natSelectorImpl.lo gnu/java/nio/natNIOServerSocket.lo \
|
||||
java/io/natFile.lo java/io/natFileDescriptor.lo \
|
||||
gnu/java/nio/natPipeImpl.lo gnu/java/nio/natSelectorImpl.lo \
|
||||
gnu/java/nio/natNIOServerSocket.lo \
|
||||
gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
|
||||
java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
|
||||
java/lang/natCharacter.lo java/lang/natClass.lo \
|
||||
java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
|
||||
|
|
@ -2696,9 +2694,9 @@ java/lang/reflect/natArray.lo java/lang/reflect/natConstructor.lo \
|
|||
java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
|
||||
java/lang/reflect/natProxy.lo java/net/natNetworkInterface.lo \
|
||||
java/net/natInetAddress.lo java/nio/natDirectByteBufferImpl.lo \
|
||||
java/nio/channels/natFileChannelImpl.lo java/text/natCollator.lo \
|
||||
java/util/natResourceBundle.lo java/util/natTimeZone.lo \
|
||||
java/util/zip/natDeflater.lo java/util/zip/natInflater.lo
|
||||
java/text/natCollator.lo java/util/natResourceBundle.lo \
|
||||
java/util/natTimeZone.lo java/util/zip/natDeflater.lo \
|
||||
java/util/zip/natInflater.lo
|
||||
lib_org_xml_sax_la_DEPENDENCIES = libgcj.la
|
||||
lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \
|
||||
org/xml/sax/ext/LexicalHandler.lo \
|
||||
|
|
@ -3269,6 +3267,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
|||
.deps/gnu/java/nio/ServerSocketChannelSelectionKey.P \
|
||||
.deps/gnu/java/nio/SocketChannelImpl.P \
|
||||
.deps/gnu/java/nio/SocketChannelSelectionKey.P \
|
||||
.deps/gnu/java/nio/channels/FileChannelImpl.P \
|
||||
.deps/gnu/java/nio/channels/natFileChannelImpl.P \
|
||||
.deps/gnu/java/nio/charset/ISO_8859_1.P \
|
||||
.deps/gnu/java/nio/charset/Provider.P \
|
||||
.deps/gnu/java/nio/charset/US_ASCII.P \
|
||||
|
|
@ -3277,7 +3277,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
|||
.deps/gnu/java/nio/charset/UTF_16Decoder.P \
|
||||
.deps/gnu/java/nio/charset/UTF_16Encoder.P \
|
||||
.deps/gnu/java/nio/charset/UTF_16LE.P \
|
||||
.deps/gnu/java/nio/charset/UTF_8.P .deps/gnu/java/nio/natFileLockImpl.P \
|
||||
.deps/gnu/java/nio/charset/UTF_8.P \
|
||||
.deps/gnu/java/nio/natNIOServerSocket.P \
|
||||
.deps/gnu/java/nio/natPipeImpl.P .deps/gnu/java/nio/natSelectorImpl.P \
|
||||
.deps/gnu/java/rmi/RMIMarshalledObjectInputStream.P \
|
||||
|
|
@ -3654,8 +3654,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
|||
.deps/java/io/UnsupportedEncodingException.P \
|
||||
.deps/java/io/VMObjectStreamClass.P \
|
||||
.deps/java/io/WriteAbortedException.P .deps/java/io/Writer.P \
|
||||
.deps/java/io/natFile.P .deps/java/io/natFileDescriptor.P \
|
||||
.deps/java/io/natObjectInputStream.P \
|
||||
.deps/java/io/natFile.P .deps/java/io/natObjectInputStream.P \
|
||||
.deps/java/io/natVMObjectStreamClass.P \
|
||||
.deps/java/lang/AbstractMethodError.P \
|
||||
.deps/java/lang/ArithmeticException.P \
|
||||
|
|
@ -3810,7 +3809,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
|||
.deps/java/nio/channels/ConnectionPendingException.P \
|
||||
.deps/java/nio/channels/DatagramChannel.P \
|
||||
.deps/java/nio/channels/FileChannel.P \
|
||||
.deps/java/nio/channels/FileChannelImpl.P \
|
||||
.deps/java/nio/channels/FileLock.P \
|
||||
.deps/java/nio/channels/FileLockInterruptionException.P \
|
||||
.deps/java/nio/channels/GatheringByteChannel.P \
|
||||
|
|
@ -3834,7 +3832,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
|||
.deps/java/nio/channels/UnresolvedAddressException.P \
|
||||
.deps/java/nio/channels/UnsupportedAddressTypeException.P \
|
||||
.deps/java/nio/channels/WritableByteChannel.P \
|
||||
.deps/java/nio/channels/natFileChannelImpl.P \
|
||||
.deps/java/nio/channels/spi/AbstractInterruptibleChannel.P \
|
||||
.deps/java/nio/channels/spi/AbstractSelectableChannel.P \
|
||||
.deps/java/nio/channels/spi/AbstractSelectionKey.P \
|
||||
|
|
@ -4890,7 +4887,7 @@ uninstall-toolexecmainlibDATA:
|
|||
all-recursive install-data-recursive install-exec-recursive \
|
||||
installdirs-recursive install-recursive uninstall-recursive \
|
||||
check-recursive installcheck-recursive info-recursive dvi-recursive:
|
||||
@set fnord $$MAKEFLAGS; amf=$$2; \
|
||||
@set fnord $(MAKEFLAGS); amf=$$2; \
|
||||
dot_seen=no; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
|
|
@ -4910,11 +4907,11 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
|
|||
|
||||
mostlyclean-recursive clean-recursive distclean-recursive \
|
||||
maintainer-clean-recursive:
|
||||
@set fnord $$MAKEFLAGS; amf=$$2; \
|
||||
@set fnord $(MAKEFLAGS); amf=$$2; \
|
||||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -302,13 +302,12 @@ AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME, 1,
|
|||
AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME, 1,
|
||||
[Define is you have 'localtime' in <time.h>]))
|
||||
|
||||
dnl Create the subdirectory for natFileDescriptor.cc, or the attempt
|
||||
dnl Create the subdirectory for natFile.cc, or the attempt
|
||||
dnl to create the link will fail.
|
||||
test -d java || mkdir java
|
||||
test -d java/io || mkdir java/io
|
||||
test -d gnu || mkdir gnu
|
||||
AC_LINK_FILES(java/io/natFile${FILE-${PLATFORM}}.cc, java/io/natFile.cc)
|
||||
AC_LINK_FILES(java/io/natFileDescriptor${FILE-${PLATFORM}}.cc, java/io/natFileDescriptor.cc)
|
||||
|
||||
dnl Likewise for ConcreteProcess.java and natConcreteProcess.cc.
|
||||
test -d java/lang || mkdir java/lang
|
||||
|
|
@ -330,6 +329,8 @@ dnl Likewise for natPipeImpl.cc and natSelectorImpl.cc.
|
|||
test -d gnu/java/nio || mkdir gnu/java/nio
|
||||
AC_LINK_FILES(gnu/java/nio/natPipeImpl${PLATFORM}.cc, gnu/java/nio/natPipeImpl.cc)
|
||||
AC_LINK_FILES(gnu/java/nio/natSelectorImpl${PLATFORM}.cc, gnu/java/nio/natSelectorImpl.cc)
|
||||
test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
|
||||
AC_LINK_FILES(gnu/java/nio/channels/natFileChannel${PLATFORM}.cc, gnu/java/nio/channels/natFileChannelImpl.cc)
|
||||
|
||||
case "${host}" in
|
||||
*mingw*)
|
||||
|
|
|
|||
Loading…
Reference in New Issue