You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2013/04/27 06:43:20 UTC
svn commit: r1476490 - in /river/jtsk/skunk/qa_refactor/trunk: ./
dep-libs/rc-libs/ qa/ qa/harness/policy/ qa/src/com/sun/jini/qa/resources/
qa/src/com/sun/jini/test/impl/outrigger/matching/
qa/src/com/sun/jini/test/impl/start/ qa/src/com/sun/jini/test...
Author: peter_firmstone
Date: Sat Apr 27 04:43:19 2013
New Revision: 1476490
URL: http://svn.apache.org/r1476490
Log:
More thread visibility updates and concurrency improvements.
Added:
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-javadoc.jar (with props)
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-sources.jar (with props)
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-test-sources.jar (with props)
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3.jar (with props)
Removed:
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-javadoc.jar
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-sources.jar
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-test-sources.jar
river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2.jar
Modified:
river/jtsk/skunk/qa_refactor/trunk/ (props changed)
river/jtsk/skunk/qa_refactor/trunk/build.xml
river/jtsk/skunk/qa_refactor/trunk/common.xml
river/jtsk/skunk/qa_refactor/trunk/qa/build.xml
river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/jeri/internal/mux/Mux.java
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/AvailabilityRegistrationWatcher.java
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/OperationJournal.java
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/TransitionWatcher.java
river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java
Propchange: river/jtsk/skunk/qa_refactor/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr 27 04:43:19 2013
@@ -1,14 +1,14 @@
classes
LICENSE.txt
-.*
build
+.*
lib-dl
lib-ext
lib
build.properties
doc
-configentry
deps
+configentry
nbproject
NOTICE.txt
dist
Modified: river/jtsk/skunk/qa_refactor/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/build.xml?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/build.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/build.xml Sat Apr 27 04:43:19 2013
@@ -2195,14 +2195,14 @@
<mkdir dir="${test.classes.dir}"/>
<mkdir dir="${test.results.dir}"/>
<copy file="dep-libs/high-scale-lib/high-scale-lib.jar" todir="test/lib"/>
- <copy file="dep-libs/rc-libs/custard-apple-1.0.2.jar" todir="test/lib"/>
+ <copy file="dep-libs/rc-libs/custard-apple-1.0.3.jar" todir="test/lib"/>
</target>
<target name="clean-tests" depends="">
<delete dir="${test.classes.dir}" quiet="true"/>
<delete dir="${test.results.dir}" quiet="true"/>
<delete file="test/lib/high-scale-lib.jar" quiet="true"/>
- <delete file="test/lib/custard-apple-1.0.2.jar" quiet="true"/>
+ <delete file="test/lib/custard-apple-1.0.3.jar" quiet="true"/>
</target>
<target name="compile-tests" depends="compile,prep-tests">
Modified: river/jtsk/skunk/qa_refactor/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/common.xml?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/common.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/common.xml Sat Apr 27 04:43:19 2013
@@ -139,7 +139,7 @@
</fileset>
<fileset id="reference-collections.jar" dir="${root}/dep-libs/rc-libs">
- <include name="custard-apple-1.0.2.jar" />
+ <include name="custard-apple-1.0.3.jar" />
</fileset>
<fileset id="dnsjava.jar" dir="${root}/dep-libs/dnsjava">
Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-javadoc.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-javadoc.jar?rev=1476490&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-javadoc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-sources.jar?rev=1476490&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-test-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-test-sources.jar?rev=1476490&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3-test-sources.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3.jar?rev=1476490&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/build.xml?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/build.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/build.xml Sat Apr 27 04:43:19 2013
@@ -207,7 +207,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="custard-apple-1.0.2.jar"/>
+ <file name="custard-apple-1.0.3.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -216,7 +216,7 @@
errorproperty="jtreg.fail" failureproperty="jtreg.fail"
reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
jdk="${jdk.home}">
- <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/custard-apple-1.0.2.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
+ <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/custard-apple-1.0.3.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
<arg value="-timeout:16"/>
<!--<arg value="-Djsk.home=${river.home}"/>-->
<arg value="-Djtlib.tmp=${jtlib.tmp}"/>
@@ -253,7 +253,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="custard-apple-1.0.2.jar"/>
+ <file name="custard-apple-1.0.3.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -273,7 +273,7 @@
<file name="phoenix-init.jar"/>
<file name="tools.jar"/>
<file name="classserver.jar"/>
- <file name="custard-apple-1.0.2.jar"/>
+ <file name="custard-apple-1.0.3.jar"/>
<file name="high-scale-lib.jar"/>
</filelist>
</move>
@@ -337,7 +337,7 @@
<include name="jsk-platform.jar"/>
<include name="jsk-lib.jar"/>
<include name="high-scale-lib.jar"/>
- <include name="custard-apple-1.0.2.jar"/>
+ <include name="custard-apple-1.0.3.jar"/>
</fileset>
</classpath>
<env key="SOUL" value="${soul}"/>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy Sat Apr 27 04:43:19 2013
@@ -39,7 +39,7 @@ grant codebase "file:${com.sun.jini.jsk.
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
};
-grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.2.jar" {
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.3.jar" {
permission java.lang.RuntimePermission "modifyThreadGroup";
permission java.lang.RuntimePermission "setContextClassLoader";
permission java.lang.RuntimePermission "modifyThread";
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties Sat Apr 27 04:43:19 2013
@@ -132,7 +132,7 @@ net.jini.space.JavaSpace.preparername=te
# For the shared activation group and its SharedGroupImpl
#
sharedGroup.type=group
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
sharedGroup.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
sharedGroup.policyfile=<url:harness/policy/defaultsharedvm.policy>
sharedGroup.implPrefix=sharedGroupImpl
@@ -154,7 +154,7 @@ sharedGroupImpl.preparername=test.groupP
nonActivatableGroup.type=nonactivatablegroup
nonActivatableGroup.impl=com.sun.jini.qa.harness.NonActivatableGroupImpl
nonActivatableGroup.component=nonActivatableGroup
-nonActivatableGroup.classpath=${com.sun.jini.qa.home}$/lib$/nonactivatablegroup.jar$:${com.sun.jini.jsk.home}$/lib$/start.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
+nonActivatableGroup.classpath=${com.sun.jini.qa.home}$/lib$/nonactivatablegroup.jar$:${com.sun.jini.jsk.home}$/lib$/start.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
nonActivatableGroup.codebase=http://${HOST}:${com.sun.jini.qa.port}/nonactivatablegroup-dl.jar
nonActivatableGroup.policyfile=<url:harness/policy/defaultnonactvm.policy>
nonActivatableGroup.serverjvmargs=-server,${nonActivatableGroup.serverjvmargs}
@@ -176,7 +176,7 @@ vmKiller.starterConfiguration=-
#
activationSystem.type=phoenix
activationSystem.policyfile=<url:harness/policy/defaultphoenix.policy>
-activationSystem.classpath=${com.sun.jini.jsk.home}$/lib$/phoenix.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
+activationSystem.classpath=${com.sun.jini.jsk.home}$/lib$/phoenix.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar
activationSystem.codebase=http://${HOST}:${com.sun.jini.jsk.port}/phoenix-dl.jar http://<gethost>:${com.sun.jini.jsk.port}/jsk-dl.jar
activationSystem.serviceConfiguration=<url:harness/configs/<config>/phoenix/phoenix.config>
activationSystem.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
@@ -254,11 +254,11 @@ testPolicyfile=<url:harness/policy/defau
# The default classpath. This property must be defined, and must include
# all Jini dependencies as components
-testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
+testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar
# Alternate test classpath, for tests that don't use <testJar>
#
-altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
+altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar
#
# Services run with server vm; test runs with client vm
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java Sat Apr 27 04:43:19 2013
@@ -39,6 +39,7 @@ import com.sun.jini.outrigger.JavaSpaceA
import net.jini.admin.Administrable;
import com.sun.jini.qa.harness.Test;
import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -60,14 +61,14 @@ public class StressTest extends MatchTes
* Collection of <code>Entry</code> objects written
* to the space by writer tasks.
*/
- private RandomList writeList = new RandomList();
+ private final RandomList writeList = new RandomList();
/**
* True if test should interleave read and write operations.
* Otherwise, all write operations will complete before
* before the read operations take place.
*/
- private boolean interleave = false;
+ private volatile boolean interleave = false;
/*
* TODO: Add -interleave <chunk size> processing (eg
@@ -77,36 +78,36 @@ public class StressTest extends MatchTes
/**
* Number of <code>Entry</code> objects to put into the space.
*/
- private int numEntries = 1000;
+ private volatile int numEntries = 1000;
/**
* Running count of <code>Entry</code> objects to put into the space.
* This number will be used to schedule some casualty processing.
*/
- private Counter writeCount = new Counter();
+ private final Counter writeCount = new Counter();
/**
* Running count of <code>Entry</code> objects taken from the space.
* This number will be used to schedule some casualty processing.
*/
- private Counter takeCount = new Counter();
+ private final Counter takeCount = new Counter();
/**
* Number of writer tasks to schedule.
*/
- private int numWriters = 1;
+ private volatile int numWriters = 1;
/**
* Number of reader tasks to schedule.
*/
- private int numReaders = 1;
+ private volatile int numReaders = 1;
/**
* The <code>TaskManager</code> handling read/write tasks.
* Not valid until <code>construct()</code> is called.
* @see StressTest#construct
*/
- private TaskManager taskMgr = null;
+ private volatile TaskManager taskMgr = null;
/**
* Maintains number of task objects created. Used to
@@ -114,7 +115,7 @@ public class StressTest extends MatchTes
* If static data could be contained in inner classes,
* this would be declared in the StressTask class.
*/
- private static int taskCounter = 0;
+ private final static AtomicInteger taskCounter = new AtomicInteger();
/**
* Flag value for determining when a shutdown request has been issued.
@@ -122,20 +123,20 @@ public class StressTest extends MatchTes
* reissue them one more time. Fail test RemoteExceptions are caught
* when the flag is false or on second tries.
*/
- private boolean shutdownAlready = false;
+ private volatile boolean shutdownAlready = false;
/**
* Flag value which is set after a space restart notification.
* If true, prevent subsequent threads from waiting on this object.
*/
- private boolean restartNotificationSent = false;
+ private volatile boolean restartNotificationSent = false;
/**
* If set, compute timing statistics for reads, takes, and
* and write operations.
* Not valid until <code>construct()</code> is called.
*/
- protected boolean timingStats;
+ protected volatile boolean timingStats;
/**
* If set, verify each take operation with a subsequent read operation.
@@ -143,15 +144,15 @@ public class StressTest extends MatchTes
* to verify that the take took place.
* Not valid until <code>construct()</code> is called.
*/
- protected boolean verifyingTakes;
+ protected volatile boolean verifyingTakes;
/**
* fields which are added during porting for correct failure messages
*/
- protected boolean WriteRandomEntryTaskOK = true;
- protected String WriteRandomEntryTaskMSG;
- protected boolean ReadAndTakeEntryTaskOK = true;
- protected String ReadAndTakeEntryTaskMSG;
+ protected volatile boolean WriteRandomEntryTaskOK = true;
+ protected volatile String WriteRandomEntryTaskMSG;
+ protected volatile boolean ReadAndTakeEntryTaskOK = true;
+ protected volatile String ReadAndTakeEntryTaskMSG;
/**
* Method called for parsing command line arguments.
@@ -956,7 +957,7 @@ public class StressTest extends MatchTes
public StressTask(String prefix) {
// Generate unique id
- id = ++taskCounter;
+ id = taskCounter.incrementAndGet();
// Generate unique prefix string for output messages.
name = ((prefix == null) ? "???Task" : prefix) + "_" + id + ": ";
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td Sat Apr 27 04:43:19 2013
@@ -32,4 +32,4 @@ com.sun.jini.test.impl.start.ClassLoader
com.sun.jini.test.impl.start.ClassLoaderTest2.host=master
include0=start.properties
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar$:<file:lib/qa1-start-testservice-common.jar>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td Sat Apr 27 04:43:19 2013
@@ -33,7 +33,7 @@ com.sun.jini.test.impl.start.ClasspathTe
com.sun.jini.test.impl.start.ClasspathTest2.host=master
// Shared group overrides
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.3.jar$:<file:lib/qa1-start-testservice-common.jar>
sharedGroup.codebase=http://${HOST}:${com.sun.jini.jsk.port}/create-dl.jar http://${HOST}:${com.sun.jini.test.port}/qa1-start-testservice-common-dl.jar
sharedGroup.policy=<url:harness/policy/all.policy>
include0=start.properties
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy Sat Apr 27 04:43:19 2013
@@ -71,7 +71,7 @@ grant codebase "file:${com.sun.jini.jsk.
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
};
-grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.2.jar" {
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.3.jar" {
permission java.lang.RuntimePermission "modifyThreadGroup";
permission java.lang.RuntimePermission "setContextClassLoader";
permission java.lang.RuntimePermission "modifyThread";
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/jeri/internal/mux/Mux.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/jeri/internal/mux/Mux.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/jeri/internal/mux/Mux.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/jeri/internal/mux/Mux.java Sat Apr 27 04:43:19 2013
@@ -139,7 +139,7 @@ abstract class Mux {
private int expectedPingCookie = -1;
/** unguarded instance state */
- private volatile long startTimeout = 15000; // milliseconds
+ private volatile long startTimeout = 30000; // milliseconds
/**
* Constructs a new Mux instance for a connection accessible through
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/AvailabilityRegistrationWatcher.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/AvailabilityRegistrationWatcher.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/AvailabilityRegistrationWatcher.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/AvailabilityRegistrationWatcher.java Sat Apr 27 04:43:19 2013
@@ -294,7 +294,7 @@ abstract class AvailabilityRegistrationW
return false; // don't remove, not our time
owners = new java.util.HashSet<TemplateHandle>(this.owners); // Don't need to clone
- this.owners.clear(); // now it's null, it doesn't need sync anymore.
+ this.owners.clear();
removed = true;
expiration = Long.MIN_VALUE; //Make sure no one tries to renew us
serv = server;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/OperationJournal.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/OperationJournal.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/OperationJournal.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/OperationJournal.java Sat Apr 27 04:43:19 2013
@@ -159,10 +159,10 @@ class OperationJournal extends Thread {
* <code>watcherRegistered</code> has not yet
* been called.
*/
- private JournalNode end;
+ private volatile JournalNode end;
/** Our current position in the journal */
- private JournalNode current;
+ private volatile JournalNode current;
/**
* Create a new <code>TransitionIterator</code> that will
@@ -468,6 +468,8 @@ class OperationJournal extends Thread {
} catch (Throwable tt) {
// don't let a problem in logging kill the thread
}
+ if (t instanceof Error) throw (Error) t;
+ if (t instanceof RuntimeException) throw (RuntimeException) t;
}
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableReference.java Sat Apr 27 04:43:19 2013
@@ -38,13 +38,13 @@ import net.jini.security.ProxyPreparer;
*/
class StorableReference implements Externalizable {
/** The proxy in marshalled form */
- private volatile MarshalledObject bytes;
+ private MarshalledObject bytes;
/** A cached copy of the unmarshalled proxy */
- private volatile transient Object obj;
+ private transient Object obj;
/** True if the <code>obj</code> has been prepared */
- private volatile transient boolean prepared;
+ private transient boolean prepared;
private static final boolean DEBUG = false;
private static final long serialVersionUID = -3793675220968988873L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/TransitionWatcher.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/TransitionWatcher.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/TransitionWatcher.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/TransitionWatcher.java Sat Apr 27 04:43:19 2013
@@ -17,6 +17,8 @@
*/
package com.sun.jini.outrigger;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Base class for objects that represent interest in particular entry
* visibility transitions. Each <code>TransitionWatcher</code> has a
@@ -49,10 +51,8 @@ abstract class TransitionWatcher impleme
final long startOrdinal;
/** Next tiebreaker to use */
- private static long nextTiebreaker = 0;
+ private final static AtomicLong nextTiebreaker = new AtomicLong();
- /** Lock for nextTiebreaker */
- private static Object nextTiebreakerLock = new Object();
/**
* Create a new <code>TransitionWatcher</code>.
@@ -65,10 +65,8 @@ abstract class TransitionWatcher impleme
TransitionWatcher(long timestamp, long startOrdinal) {
this.timestamp = timestamp;
this.startOrdinal = startOrdinal;
-
- synchronized (nextTiebreakerLock) {
- tiebreaker = nextTiebreaker++;
- }
+ tiebreaker = nextTiebreaker.getAndIncrement();
+
}
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java?rev=1476490&r1=1476489&r2=1476490&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java Sat Apr 27 04:43:19 2013
@@ -139,7 +139,7 @@ final class ThreadPool implements Execut
Runnable task = new Task(runnable, name);
boolean accepted = false;
try {
- accepted = queue.offer(task, 1000 * delayFactor* (threadCount.get()/ numberOfCores), TimeUnit.MICROSECONDS);
+ accepted = queue.offer(task, 700 * delayFactor* (threadCount.get()/ numberOfCores), TimeUnit.MICROSECONDS);
} catch (InterruptedException ex) {
Logger.getLogger(ThreadPool.class.getName()).log(Level.SEVERE, "Calling thread interrupted", ex);
// restore interrupt.