Menu
▾
▴
[rvm-commits] SF.net SVN: jikesrvm:[15185] rvmroot/branches/RVM-PureNativeThread/ workingMergeUp
|
From: <pi...@us...> - 2008-11-18 01:27:17
|
Revision: 15185
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15185&view=rev
Author: pizlo
Date: 2008-11-18 01:27:13 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
more checkstyle fixes
Modified Paths:
--------------
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/TransitiveClosure.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/heap/PageResource.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSRListener.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/controller/Controller.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/classloader/TypeReference.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/runtime/FileSystem.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/Lock.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/RVMThread.java
rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/SoftLatch.java
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -29,10 +29,6 @@
import org.jikesrvm.runtime.Magic;
import org.jikesrvm.scheduler.RVMThread;
import org.jikesrvm.scheduler.FinalizerThread;
-import org.mmtk.plan.CollectorContext;
-import org.mmtk.plan.MutatorContext;
-import org.mmtk.plan.Plan;
-import org.mmtk.utility.options.Options;
import org.vmmagic.pragma.Inline;
import org.vmmagic.pragma.Interruptible;
import org.vmmagic.pragma.Uninterruptible;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -13,7 +13,6 @@
package org.jikesrvm.mm.mmtk;
import org.jikesrvm.VM;
-import org.jikesrvm.Services;
import org.vmmagic.unboxed.*;
import org.vmmagic.pragma.*;
@@ -22,11 +21,7 @@
import org.jikesrvm.runtime.Magic;
import org.jikesrvm.scheduler.RVMThread;
import org.jikesrvm.scheduler.ThreadQueue;
-import org.jikesrvm.scheduler.Latch;
-import org.mmtk.utility.Log;
-
-
/**
* Adaptive mutex with a spinlock fast path. Designed for good performance
* on native threaded systems. This implementation has the following specific
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -14,7 +14,6 @@
import org.mmtk.utility.alloc.Allocator;
-import org.jikesrvm.VM;
import org.jikesrvm.runtime.Magic;
import org.jikesrvm.objectmodel.JavaHeaderConstants;
import org.jikesrvm.objectmodel.TIB;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/TransitiveClosure.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/TransitiveClosure.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/TransitiveClosure.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -13,7 +13,6 @@
package org.mmtk.plan;
import org.mmtk.vm.VM;
-import org.mmtk.utility.Log;
import org.vmmagic.pragma.*;
import org.vmmagic.unboxed.*;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/generational/GenMutator.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/plan/generational/GenMutator.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -15,7 +15,6 @@
import org.mmtk.plan.*;
import org.mmtk.policy.CopyLocal;
import org.mmtk.policy.Space;
-import org.mmtk.utility.Log;
import org.mmtk.utility.deque.*;
import org.mmtk.utility.alloc.Allocator;
import org.mmtk.utility.statistics.Stats;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/heap/PageResource.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/heap/PageResource.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/heap/PageResource.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -15,7 +15,6 @@
import org.mmtk.plan.Plan;
import org.mmtk.policy.Space;
import org.mmtk.utility.Constants;
-import org.mmtk.utility.Log;
import org.mmtk.utility.options.ProtectOnRelease;
import org.mmtk.utility.options.Options;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -14,7 +14,6 @@
import org.mmtk.plan.TraceLocal;
import org.mmtk.plan.Trace;
-import org.mmtk.utility.Log;
import org.vmmagic.pragma.*;
import org.vmmagic.unboxed.*;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSRListener.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSRListener.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSRListener.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -17,7 +17,6 @@
import org.jikesrvm.compilers.common.CompiledMethods;
import org.jikesrvm.runtime.Magic;
import org.jikesrvm.scheduler.RVMThread;
-import org.jikesrvm.VM;
import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.unboxed.Address;
import org.vmmagic.unboxed.Offset;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -13,7 +13,6 @@
package org.jikesrvm.adaptive;
import org.jikesrvm.adaptive.controller.Controller;
-import org.jikesrvm.runtime.Entrypoints;
import org.jikesrvm.runtime.Magic;
import org.jikesrvm.scheduler.RVMThread;
import org.vmmagic.pragma.Uninterruptible;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -17,7 +17,6 @@
import org.jikesrvm.compilers.common.CompiledMethod;
import org.jikesrvm.compilers.common.CompiledMethods;
import org.jikesrvm.scheduler.RVMThread;
-import org.jikesrvm.runtime.Magic;
import org.vmmagic.pragma.NoInline;
import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.unboxed.Offset;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/controller/Controller.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/controller/Controller.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/controller/Controller.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -23,7 +23,6 @@
import org.jikesrvm.adaptive.measurements.RuntimeMeasurements;
import org.jikesrvm.adaptive.measurements.instrumentation.Instrumentation;
import org.jikesrvm.adaptive.measurements.organizers.Organizer;
-import org.jikesrvm.adaptive.measurements.organizers.AccumulatingMethodSampleOrganizer;
import org.jikesrvm.adaptive.recompilation.CompilationThread;
import org.jikesrvm.adaptive.recompilation.instrumentation.CounterBasedSampling;
import org.jikesrvm.adaptive.util.AOSLogging;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -19,9 +19,7 @@
import org.jikesrvm.adaptive.measurements.listeners.MethodListener;
import org.jikesrvm.adaptive.util.AOSLogging;
import org.jikesrvm.scheduler.RVMThread;
-import org.jikesrvm.scheduler.Latch;
import org.vmmagic.pragma.NonMoving;
-import org.vmmagic.pragma.Uninterruptible;
/**
* An organizer for method listener information that
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -17,7 +17,6 @@
import org.jikesrvm.adaptive.controller.ControllerPlan;
import org.jikesrvm.adaptive.util.AOSLogging;
import org.jikesrvm.scheduler.RVMThread;
-import org.jikesrvm.VM;
import org.vmmagic.pragma.NonMoving;
/**
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/classloader/TypeReference.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/classloader/TypeReference.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/classloader/TypeReference.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -546,8 +546,8 @@
*/
@Uninterruptible
public boolean isRuntimeTable() {
- return this == IMT || this == TIB || this == ITable || this == ITableArray
- || this == FunctionTable;
+ return this == IMT || this == TIB || this == ITable || this == ITableArray ||
+ this == FunctionTable;
}
/**
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -17,7 +17,6 @@
import org.jikesrvm.ArchitectureSpecific.BaselineCompilerImpl;
import org.jikesrvm.ArchitectureSpecific.MachineCode;
import org.jikesrvm.VM;
-import org.jikesrvm.runtime.Magic;
import org.jikesrvm.classloader.NormalMethod;
import org.jikesrvm.compilers.common.CompiledMethod;
import org.jikesrvm.compilers.common.CompiledMethods;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -101,7 +101,6 @@
import org.jikesrvm.objectmodel.TIBLayoutConstants;
import org.jikesrvm.runtime.ArchEntrypoints;
import org.jikesrvm.runtime.MagicNames;
-import org.jikesrvm.scheduler.RVMThread;
import org.vmmagic.pragma.Interruptible;
import org.vmmagic.unboxed.Address;
import org.vmmagic.unboxed.Offset;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -14,10 +14,8 @@
import org.jikesrvm.VM;
import org.jikesrvm.mm.mmtk.Collection;
-import org.jikesrvm.mm.mmtk.Lock;
import org.jikesrvm.scheduler.RVMThread;
import org.jikesrvm.scheduler.HeavyCondLock;
-import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.pragma.Unpreemptible;
import org.mmtk.plan.Plan;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -14,7 +14,6 @@
import org.jikesrvm.VM;
import org.jikesrvm.runtime.Magic;
-import static org.jikesrvm.runtime.SysCall.sysCall;
import org.jikesrvm.scheduler.RVMThread;
import org.vmmagic.pragma.Uninterruptible;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/runtime/FileSystem.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/runtime/FileSystem.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/runtime/FileSystem.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -20,12 +20,8 @@
import java.io.PrintStream;
import org.jikesrvm.VM;
import org.jikesrvm.Callbacks;
-import org.jikesrvm.runtime.Magic;
import static org.jikesrvm.runtime.SysCall.sysCall;
-import org.jikesrvm.runtime.Time;
-import org.jikesrvm.runtime.TimeoutException;
import org.jikesrvm.util.StringUtilities;
-import org.vmmagic.pragma.Inline;
/**
* Interface to filesystem of underlying operating system. Historically
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/Lock.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/Lock.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/Lock.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -22,7 +22,6 @@
import org.vmmagic.pragma.Inline;
import org.vmmagic.pragma.Interruptible;
import org.vmmagic.pragma.Uninterruptible;
-import org.vmmagic.pragma.UninterruptibleNoWarn;
import org.vmmagic.pragma.UnpreemptibleNoWarn;
import org.vmmagic.pragma.Unpreemptible;
import org.vmmagic.unboxed.Word;
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/RVMThread.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/RVMThread.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/RVMThread.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -474,7 +474,7 @@
boolean isBlockedForGC;
@Uninterruptible
@NonMoving
- public static abstract class BlockAdapter {
+ public abstract static class BlockAdapter {
abstract boolean isBlocked(RVMThread t);
abstract void setBlocked(RVMThread t,boolean value);
abstract int requestBlock(RVMThread t);
@@ -1176,9 +1176,9 @@
* @return if the thread is running Java
*/
public final boolean isInJava() {
- return !isBlocking
- && !isAboutToTerminate
- && (execStatus==IN_JAVA || execStatus==IN_JAVA_TO_BLOCK);
+ return !isBlocking &&
+ !isAboutToTerminate &&
+ (execStatus==IN_JAVA || execStatus==IN_JAVA_TO_BLOCK);
}
/** A variant of checkBlock() that does not save the thread state. */
@NoInline
@@ -1535,7 +1535,7 @@
monitor().unlock();
if (traceBlock) VM.sysWriteln("Thread #",getCurrentThread().threadSlot," is done requesting that thread #",threadSlot," unblocks.");
}
- private final void handleDebugRequestForThread() {
+ private void handleDebugRequestForThread() {
monitor().lock();
dumpLock.lock();
extDump();
Modified: rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/SoftLatch.java
===================================================================
--- rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/SoftLatch.java 2008-11-18 01:18:43 UTC (rev 15184)
+++ rvmroot/branches/RVM-PureNativeThread/workingMergeUp/rvm/src/org/jikesrvm/scheduler/SoftLatch.java 2008-11-18 01:27:13 UTC (rev 15185)
@@ -12,8 +12,6 @@
*/
package org.jikesrvm.scheduler;
-import org.vmmagic.pragma.Uninterruptible;
-
/**
* An implementation of a latch using monitors.
* This essentially gives you park/unpark functionality. It can also
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|