procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FileLockImpl.java: Fixed filename in copyright.

Browse source 
2004-01-23  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/FileLockImpl.java:
	Fixed filename in copyright.
	(released): Removed.
	(finalize): New method.
	* gnu/java/nio/natFileLockImpl.cc
	(releaseImpl): Implemented.
	* java/nio/channels/FileChannelImpl.java:
	Reworked imports.
	(lock): Implemented.
	(lockImpl): New method.
	(tryLock): Implemented.
	(tryLockImpl): New method.
	* java/nio/channels/natFileChannelImpl.cc
	(lockImpl): New method.
	(tryLockImpl): New method.

From-SVN: r76422
This commit is contained in:
Michael Koch 2004-01-23 14:37:09 +00:00 • committed by Michael Koch
parent ca1d829f31
commit 9719e37cec
5 changed files with 86 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

41
libjava/java/nio/channels/FileChannelImpl.java
View file

@ -38,6 +38,9 @@ exception statement from your version. */
package java.nio.channels;
import gnu.classpath.Configuration;
import gnu.gcj.RawData;
import gnu.java.nio.FileLockImpl;
import java.io.EOFException;
import java.io.FileDescriptor;
import java.io.FileInputStream;
@ -47,8 +50,6 @@ import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.nio.MappedByteBufferImpl;
import gnu.classpath.Configuration;
import gnu.gcj.RawData;
/**
* This file is not user visible !
@ -354,8 +355,22 @@ public class FileChannelImpl extends FileChannel
file_obj instanceof FileInputStream)
throw new NonWritableChannelException ();
throw new Error ("Not implemented");
boolean completed = false;
try
{
begin();
lockImpl(position, size, shared);
completed = true;
return new FileLockImpl(fd, this, position, size, shared);
}
finally
{
end(completed);
}
}
private native void lockImpl(long position, long size, boolean shared);
public FileLock tryLock (long position, long size, boolean shared)
throws IOException
@ -367,9 +382,27 @@ public class FileChannelImpl extends FileChannel
if (!isOpen ())
throw new ClosedChannelException ();
throw new Error ("Not implemented");
if (! tryLockImpl(position, size, shared))
return null;
boolean completed = false;
try
{
boolean lockable = tryLockImpl(position, size, shared);
completed = true;
return (lockable
? new FileLockImpl(fd, this, position, size, shared)
: null);
}
finally
{
end(completed);
}
}
private native boolean tryLockImpl(long position, long size, boolean shared);
public long position ()
throws IOException
{

16
libjava/java/nio/channels/natFileChannelImpl.cc
View file

@ -25,11 +25,13 @@ details. */
#endif
#include <gnu/gcj/RawData.h>
#include <gnu/java/nio/FileLockImpl.h>
#include <java/io/FileDescriptor.h>
#include <java/io/IOException.h>
#include <java/nio/ByteBuffer.h>
#include <java/nio/channels/FileChannel.h>
#include <java/nio/channels/FileChannelImpl.h>
#include <java/nio/channels/FileLock.h>
jlong
java::nio::channels::FileChannelImpl::size ()
@ -92,3 +94,17 @@ java::nio::channels::FileChannelImpl::nio_msync (gnu::gcj::RawData* /*map_addres
{
throw new ::java::io::IOException (JvNewStringUTF ("msync not implemented"));
}
void
java::nio::channels::FileChannelImpl::lockImpl(jlong position, jlong size, jboolean shared)
{
// FIXME: shared is unused, write is always true.
fd->lock(position, size, true);
}
jboolean
java::nio::channels::FileChannelImpl::tryLockImpl(jlong position, jlong size, jboolean shared)
{
// FIXME: shared is unused, write is always true.
return fd->tryLock(position, size, true);
}