From: Mark Wielaard <mark@klomp.org>
To: mauve-discuss@sources.redhat.com
Subject: New locks tests need -Dmauve.vmexec set
Date: Sun, 31 Jul 2005 18:08:00 -0000 [thread overview]
Message-ID: <1122831744.5924.25.camel@localhost.localdomain> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 402 bytes --]
Hi,
I just checked in the following for the new file lock tests.
I have updated runner to pass -Dmauve.vmexec=$RUNTIME.
When you use some other way to run mauve you may want to update that to
include the appropriate system property. If you don't the test will fail
with: FAIL: gnu.testlet.java.nio.channels.FileChannel.lock: mauve.vmexec
system property NOT SET! (number 1)
Cheers,
Mark
[-- Attachment #1.2: patch --]
[-- Type: text/x-patch, Size: 15231 bytes --]
Index: ChangeLog
===================================================================
RCS file: /cvs/mauve/mauve/ChangeLog,v
retrieving revision 1.1039
diff -u -r1.1039 ChangeLog
--- ChangeLog 29 Jul 2005 11:47:08 -0000 1.1039
+++ ChangeLog 31 Jul 2005 17:41:23 -0000
@@ -1,3 +1,9 @@
+2005-07-31 Mark Wielaard <mark@klomp.org>
+
+ * gnu/testlet/java/nio/channels/FileChannel/lock.java: New test.
+ * runner: Add -Dmauve.vmexec=$RUNTIME.
+ * batch_run (COMPILER): Add -nowarn.
+
2005-07-29 Jeroen Frijters <jeroen@frijters.net>
* gnu/testlet/java/lang/ClassLoader/findLoadedClass.java:
Index: batch_run
===================================================================
RCS file: /cvs/mauve/mauve/batch_run,v
retrieving revision 1.16
diff -u -r1.16 batch_run
--- batch_run 9 Jul 2005 19:05:53 -0000 1.16
+++ batch_run 31 Jul 2005 17:41:23 -0000
@@ -38,7 +38,7 @@
if test "x$COMPILER" = "x"; then
#COMPILER="gcj -C -Wno-deprecated"
-COMPILER="jikes -bootclasspath /usr/local/classpath/share/classpath/glibj.zip"
+COMPILER="jikes -nowarn -bootclasspath /usr/local/classpath/share/classpath/glibj.zip"
fi
if test "x$COMPILER" = "xgcj"; then
Index: runner
===================================================================
RCS file: /cvs/mauve/mauve/runner,v
retrieving revision 1.13
diff -u -r1.13 runner
--- runner 9 Jul 2005 19:31:07 -0000 1.13
+++ runner 31 Jul 2005 17:41:23 -0000
@@ -35,7 +35,7 @@
#RUNTIME="Kissme"
#RUNTIME="/usr/local/sablevm/bin/sablevm -Y"
#RUNTIME="jc -Xint"
-RUNTIME=jamvm
+RUNTIME="jamvm"
#RUNTIME="native"
fi
@@ -63,7 +63,7 @@
echo $testclass > testfilename.txt
./SimpleTestHarness -debug -verbose -file testfilename.txt &
else
- echo $testclass | $RUNTIME gnu.testlet.SimpleTestHarness -debug -verbose &
+ echo $testclass | $RUNTIME -Dmauve.vmexec=$RUNTIME gnu.testlet.SimpleTestHarness -debug -verbose &
fi
PID=$!
wait $PID
Index: gnu/testlet/java/nio/channels/FileChannel/lock.java
===================================================================
RCS file: gnu/testlet/java/nio/channels/FileChannel/lock.java
diff -N gnu/testlet/java/nio/channels/FileChannel/lock.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/nio/channels/FileChannel/lock.java 31 Jul 2005 17:41:23 -0000
@@ -0,0 +1,539 @@
+// Tags: JDK1.4
+
+// Copyright (C) 2005 Mark J. Wielaard <mark@klomp.org>
+
+// This file is part of Mauve.
+
+// Mauve is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// Mauve is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Mauve; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+package gnu.testlet.java.nio.channels.FileChannel;
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+
+import gnu.testlet.Testlet;
+import gnu.testlet.TestHarness;
+
+/**
+ * Tests FileChannel lock(), tryLock() and FileLock methods. We test
+ * shared locking (which is optional for read only channels, so will
+ * fail when not supported).
+ */
+public class lock implements Testlet, Runnable
+{
+
+ DataInputStream dis;
+ DataOutputStream dos;
+ BufferedReader br;
+
+ TestHarness harness;
+
+ public void test(TestHarness harness)
+ {
+ this.harness = harness;
+ String filename = harness.getTempDirectory()
+ + File.separator + "mauvelock";
+ File file = new File(filename);
+
+ FileOutputStream fos = null;
+ FileInputStream fis = null;
+ RandomAccessFile raf = null;
+ FileChannel channel;
+
+ try
+ {
+ // Setup. Remove and recreate test file
+ // Fill the file with some stuff 5Mb in total
+ // Start another runtime the check that locks actually work.
+ file.delete();
+ file.createNewFile();
+ fos = new FileOutputStream(file);
+ byte[] bs = new byte[256];
+ for (int i = 0; i < 256; i++)
+ bs[i] = (byte) i;
+ for (int i = 0; i < 4 * 5; i++)
+ fos.write(bs);
+ fos.close();
+ fos = null;
+ }
+ catch (IOException ioe)
+ {
+ // If we cannot even create the file just die
+ harness.check(false, ioe.toString());
+ harness.debug(ioe);
+ return;
+ }
+
+ Process p = null;
+ try
+ {
+ String execvm = System.getProperty("mauve.vmexec");
+ if (execvm == null || execvm.equals(""))
+ harness.check(false, "mauve.vmexec system property NOT SET!");
+ else
+ {
+ String cmd = execvm + " " + this.getClass().getName();
+ p = Runtime.getRuntime().exec(cmd);
+ dis = new DataInputStream(p.getInputStream());
+ dos = new DataOutputStream(p.getOutputStream());
+ br = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+ // Drain error stream
+ Thread t = new Thread(this);
+ t.setDaemon(true);
+ t.start();
+
+ dos.writeUTF(filename);
+ dos.flush();
+
+ // Read OK message to make sure other process is ready.
+ harness.debug(dis.readUTF());
+ }
+ }
+ catch (IOException ioe)
+ {
+ // Not much will work now...
+ p = null;
+ harness.check(false, ioe.toString());
+ harness.debug(ioe);
+ }
+
+ try
+ {
+ fos = new FileOutputStream(file);
+ channel = fos.getChannel();
+ testChannelLock("FileOutputStream", channel, false, true);
+ fos.close();
+ fos = null;
+
+ fis = new FileInputStream(file);
+ channel = fis.getChannel();
+ testChannelLock("FileInputStream", channel, true, false);
+ fis.close();
+ fis = null;
+
+ raf = new RandomAccessFile(file, "r");
+ channel = raf.getChannel();
+ testChannelLock("RandomAccessFile(r)", channel, true, false);
+ raf.close();
+ raf = null;
+
+ raf = new RandomAccessFile(file, "rw");
+ channel = raf.getChannel();
+ testChannelLock("RandomAccessFile(rw)", channel, true, true);
+ raf.close();
+ raf = null;
+ }
+ catch (IOException ioe)
+ {
+ // Deep trouble...
+ harness.debug(ioe);
+ harness.check(false, ioe.toString());
+ }
+ finally
+ {
+ // Cleanup, close everything and remove test file.
+ if (fos != null)
+ {
+ try
+ {
+ fos.close();
+ }
+ catch (IOException ioe)
+ {
+ harness.debug(ioe);
+ }
+ }
+ if (fis != null)
+ {
+ try
+ {
+ fis.close();
+ }
+ catch (IOException ioe)
+ {
+ harness.debug(ioe);
+ }
+ }
+ if (raf != null)
+ {
+ try
+ {
+ raf.close();
+ }
+ catch (IOException ioe)
+ {
+ harness.debug(ioe);
+ }
+ }
+ harness.check(file.delete(), "cleanup " + file);
+
+ try
+ {
+ if (p != null)
+ {
+ dos.writeUTF("quit");
+ dos.flush();
+ p.destroy();
+ p.waitFor();
+ }
+ }
+ catch (IOException ioe)
+ {
+ harness.debug(ioe);
+ }
+ catch (InterruptedException ie)
+ {
+ harness.debug(ie);
+ }
+ }
+ }
+
+ private void testChannelLock(String what,
+ FileChannel channel,
+ boolean read, boolean write)
+ {
+ FileLock lock = null;
+ try
+ {
+ harness.checkPoint(what + " lock()");
+ boolean illegal;
+ try
+ {
+ lock = channel.lock();
+ illegal = false;
+ }
+ catch (NonWritableChannelException nrca)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !write);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 0, Long.MAX_VALUE, false);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+
+ harness.checkPoint(what + " tryLock()");
+ try
+ {
+ lock = channel.tryLock();
+ illegal = false;
+ }
+ catch (NonWritableChannelException nwce)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !write);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 0, Long.MAX_VALUE, false);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+
+ harness.checkPoint(what + " lock(129, 2050, false)");
+ try
+ {
+ lock = channel.lock(129, 2050, false);
+ illegal = false;
+ }
+ catch (NonWritableChannelException nwce)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !write);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 129, 2050, false);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+
+ harness.checkPoint(what + " tryLock(129, 2050, false)");
+ try
+ {
+ lock = channel.tryLock(129, 2050, false);
+ illegal = false;
+ }
+ catch (NonWritableChannelException nwce)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !write);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 129, 2050, false);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+
+ harness.checkPoint(what + " lock(129, 2050, true)");
+ try
+ {
+ lock = channel.lock(129, 2050, true);
+ illegal = false;
+ }
+ catch (NonReadableChannelException nrce)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !read);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 129, 2050, true);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+
+ harness.checkPoint(what + " tryLock(129, 2050, true)");
+ try
+ {
+ lock = channel.tryLock(129, 2050, true);
+ illegal = false;
+ }
+ catch (NonReadableChannelException nrce)
+ {
+ illegal = true;
+ }
+ harness.check(illegal, !read);
+ harness.check(illegal || lock != null);
+ if (lock != null)
+ {
+ try
+ {
+ testLock(what, channel, lock, 129, 2050, true);
+ }
+ finally
+ {
+ lock.release();
+ harness.check(lock.isValid(), false);
+ lock = null;
+ }
+ }
+ }
+ catch(IOException ioe)
+ {
+ harness.debug(ioe);
+ harness.check(false);
+ }
+ }
+
+ private void testLock(String what,
+ FileChannel channel,
+ FileLock lock,
+ long position,
+ long size,
+ boolean shared)
+ throws IOException
+ {
+ harness.checkPoint(what + ": " + lock);
+ harness.check(lock.channel(), channel);
+ harness.check(lock.position(), position);
+ harness.check(lock.size(), size);
+ harness.check(lock.isShared(), shared);
+ harness.check(lock.isValid(), true);
+ harness.check(lock.overlaps(0, Long.MAX_VALUE), true);
+ harness.check(lock.overlaps(position, size), true);
+ if (position < Long.MAX_VALUE)
+ harness.check(lock.overlaps(0, position + 1), true);
+ if (position > 0)
+ {
+ harness.check(lock.overlaps(0, 1), false);
+ harness.check(lock.overlaps(0, position - 1), false);
+ }
+ if (size < Long.MAX_VALUE && position > 0)
+ harness.check(lock.overlaps(position - 1, size + 1), true);
+ if (size > 1)
+ harness.check(lock.overlaps(position, size - 1), true);
+
+ // Let the other process try to lock some things.
+ if (dos != null)
+ {
+ dos.writeUTF("lock");
+ harness.debug("Sending: "
+ + position + ", " + size + " (" + shared + ")");
+ harness.debug("lock: " + lock);
+ dos.writeLong(position);
+ dos.writeLong(size);
+ dos.writeBoolean(shared);
+ dos.flush();
+
+ harness.debug("EXTERNAL: " + dis.readUTF());
+ harness.check(dis.readBoolean(), what + " external " + lock);
+ }
+ }
+
+ public void run()
+ {
+ // Drain error stream from external process.
+ // Null input (EOFException) will stop loop.
+ try
+ {
+ String line = br.readLine();
+ while (line != null)
+ {
+ harness.debug(" ex: " + line);
+ line = br.readLine();
+ }
+ }
+ catch(IOException ioe)
+ {
+ }
+ }
+
+ public static void main(String[] args) throws Exception
+ {
+ DataInputStream dis = new DataInputStream(System.in);
+ DataOutputStream dos = new DataOutputStream(System.out);
+
+ String file = dis.readUTF();
+ RandomAccessFile raf = new RandomAccessFile(file, "rw");
+ FileChannel channel = raf.getChannel();
+
+ // Let the other process know we are ready.
+ dos.writeUTF("Opened file: " + file);
+ dos.flush();
+
+ try
+ {
+ String command = dis.readUTF();
+ while (command != null && !command.equals("quit"))
+ {
+ long position = dis.readLong();
+ long size = dis.readLong();
+ boolean shared = dis.readBoolean();
+
+ // This will be printed by the main process with harness.debug()
+ System.err.println("Recv: "
+ + position + ", " + size + " (" + shared + ")");
+
+ String what = "lock[" + position + "," + size + "," + shared + "]";
+ String message = "X";
+ boolean result = true;
+
+ // Try to get the same (and exclusive) lock
+ // This should always fail.
+ FileLock lock = null;
+ try
+ {
+ lock = channel.tryLock(position, size, false);
+ if (lock != null)
+ {
+ result = false;
+ message = "Got lock: " + lock;
+ }
+ }
+ finally
+ {
+ // Clean up anyway
+ try
+ {
+ lock.release();
+ lock = null;
+ }
+ catch(Throwable t)
+ {
+ }
+ }
+
+ // If we couldn't get an exclusive lock and the lock is shared,
+ // we should be able to get a shared lock
+ if (result && shared)
+ {
+ try
+ {
+ lock = channel.tryLock(position, size, true);
+ if (lock == null)
+ {
+ result = false;
+ message = "Couldn't get shared lock";
+ }
+ }
+ finally
+ {
+ // Clean up
+ try
+ {
+ lock.release();
+ lock = null;
+ }
+ catch(Throwable t)
+ {
+ }
+ }
+ }
+
+ if (result)
+ dos.writeUTF("OK: " + what);
+ else
+ dos.writeUTF("Failed: " + what + ": " + message);
+ dos.writeBoolean(result);
+ dos.flush();
+
+ command = dis.readUTF();
+ }
+ }
+ catch (Throwable t)
+ {
+ // Urgh
+ dos.writeUTF("External error: " + t.toString());
+ t.printStackTrace();
+ System.err.flush();
+ }
+ }
+}
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2005-07-31 18:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-31 18:08 Mark Wielaard [this message]
2005-08-01 9:30 Jeroen Frijters
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1122831744.5924.25.camel@localhost.localdomain \
--to=mark@klomp.org \
--cc=mauve-discuss@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).