Important annotations.

Author: perlfu

MMTk/src/org/mmtk/plan/ParallelCollector.java

@@ -52,6 +52,7 @@ public void run() {
   }
 
   /** Perform a single garbage collection */
+  @Unpreemptible
   public void collect() {
     VM.assertions.fail("Collector has not implemented collectionPhase");
   }

MMTk/src/org/mmtk/plan/Simple.java

@@ -264,6 +264,16 @@ public void collectionPhase(short phaseId) {
   }
 
   /**
+   * Perform a (global) unpreemptible collection phase.
+   */
+  @Unpreemptible
+  public void unpreemptibleCollectionPhase(short phaseId) {
+    Log.write("Unpreemptible Global phase "); Log.write(Phase.getName(phaseId));
+    Log.writeln(" not handled.");
+    VM.assertions.fail("Unpreemptible Global phase not handled!");
+  }
+
+  /*
    * Update the nursery zeroing approach based on option settings.
    *
    * @param nurserySpace The space to apply the changes to.

MMTk/src/org/mmtk/plan/StopTheWorldCollector.java

@@ -35,7 +35,7 @@ public abstract class StopTheWorldCollector extends SimpleCollector {
    */
 
   /** Perform garbage collection */
-  @Override
+  @Unpreemptible
   public void collect() {
     Phase.beginNewPhaseStack(Phase.scheduleComplex(global().collection));
   }

MMTk/src/org/mmtk/plan/nogc/NoGC.java

@@ -70,6 +70,14 @@ public final void collectionPhase(short phaseId) {
     */
   }
 
+  /**
+   * Perform a (global) unpreemptible collection phase.
+   */
+  @Unpreemptible
+  public void unpreemptibleCollectionPhase(short phase) {
+    if (VM.VERIFY_ASSERTIONS) VM.assertions._assert(false);
+  }
+
   /*****************************************************************************
    * Accounting
    */

MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java

@@ -23,6 +23,7 @@
 import org.mmtk.vm.VM;
 import org.vmmagic.pragma.Inline;
 import org.vmmagic.pragma.Uninterruptible;
+import org.vmmagic.pragma.Unpreemptible;
 import org.vmmagic.unboxed.ObjectReference;
 
 /**
@@ -79,6 +80,7 @@ public RCBaseCollector() {
   /**
    * {@inheritDoc}
    */
+  @Unpreemptible
   @Override
   public void collect() {
     if (RCBase.BUILD_FOR_GENRC) Phase.beginNewPhaseStack(Phase.scheduleComplex(global().genRCCollection));

libraryInterface/Common/src/java/lang/ref/PhantomReference.java

@@ -14,6 +14,7 @@
 
 import org.jikesrvm.mm.mminterface.MemoryManager;
 import org.vmmagic.pragma.ReferenceFieldsVary;
+import org.vmmagic.pragma.Uninterruptible;
 
 /**
  * Implementation of java.lang.ref.PhantomReference for JikesRVM.

rvm/src/org/jikesrvm/CommandLineArgs.java

@@ -23,6 +23,7 @@
 
 import static org.jikesrvm.runtime.SysCall.sysCall;
 import org.jikesrvm.scheduler.RVMThread;
+import org.vmmagic.pragma.NonReplicatingAllocation;
 
 /**
  * Command line option processing iwth arbitrary prefix support.

rvm/src/org/jikesrvm/classloader/MethodReference.java

@@ -41,7 +41,6 @@ public final class MethodReference extends MemberReference {
    * Find or create a method reference
    * @see MemberReference#findOrCreate(TypeReference, Atom, Atom)
    */
-  @Pure
   public static MethodReference findOrCreate(TypeReference tRef, Atom mn, Atom md) {
     return MemberReference.findOrCreate(tRef, mn, md).asMethodReference();
   }

rvm/src/org/jikesrvm/classloader/Primitive.java

@@ -377,6 +377,7 @@ public RVMField[] getStaticFields() {
    */
   @Override
   @Pure
+  @Uninterruptible
   public RVMField[] getInstanceFields() {
     return emptyVMField;
   }

rvm/src/org/jikesrvm/classloader/RVMArray.java

@@ -251,6 +251,7 @@ public RVMField[] getStaticFields() {
    */
   @Override
   @Pure
+  @Uninterruptible
   public RVMField[] getInstanceFields() {
     return RVMType.JavaLangObjectType.getInstanceFields();
   }

rvm/src/org/jikesrvm/classloader/RVMClass.java

@@ -712,6 +712,7 @@ public RVMField[] getStaticFields() {
    */
   @Override
   @Pure
+  @Uninterruptible
   public RVMField[] getInstanceFields() {
     if (VM.VerifyAssertions) VM._assert(isResolved());
     return instanceFields;

rvm/src/org/jikesrvm/classloader/RVMField.java

@@ -143,13 +143,15 @@ public int getNumberOfStackSlots() {
   /**
    * How many bytes of memory words do value of this type take?
    */
+  @Uninterruptible
   public int getSize() {
     return size;
   }
 
   /**
    * Does the field hold a reference?
    */
+  @Uninterruptible
   public boolean isTraced() {
     return (reference && !isUntraced()) || madeTraced;
   }
@@ -228,6 +230,7 @@ public boolean isRuntimeFinal() {
   /**
    * Is this field invisible to the memory management system.
    */
+  @Uninterruptible
   public boolean isUntraced() {
     return hasUntracedAnnotation();
   }

rvm/src/org/jikesrvm/classloader/RVMType.java

@@ -814,6 +814,7 @@ public boolean isAssignableFrom(RVMType type) {
    * Non-static fields of this class/array type
    * (composed with supertypes, if any).
    */
+  @Uninterruptible
   public abstract RVMField[] getInstanceFields();
 
   /**

rvm/src/org/jikesrvm/classloader/UnboxedType.java

@@ -323,6 +323,7 @@ public RVMField[] getStaticFields() {
    */
   @Override
   @Pure
+  @Uninterruptible
   public RVMField[] getInstanceFields() {
     return emptyVMField;
   }

rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java

@@ -27,8 +27,10 @@
 import org.jikesrvm.jni.JNICompiledMethod;
 import org.jikesrvm.runtime.Magic;
 import org.jikesrvm.runtime.Memory;
+import org.vmmagic.pragma.NonMovingAllocation;
 import org.vmmagic.pragma.Uninterruptible;
 import org.vmmagic.unboxed.Address;
+import org.vmmagic.unboxed.Offset;
 
 /**
  * Manage pool of compiled methods. <p>

rvm/src/org/jikesrvm/objectmodel/JavaHeader.java

@@ -520,7 +520,7 @@ public static int getObjectHashCode(Object o) {
 
   /** Install a new hashcode (only used if !ADDRESS_BASED_HASHING) */
   @NoInline
-  @Interruptible
+  @Uninterruptible
   protected static int installHashCode(Object o) {
     Word hashCode;
     do {

rvm/src/org/jikesrvm/scheduler/SpinLock.java

@@ -18,6 +18,7 @@
 import org.jikesrvm.runtime.Entrypoints;
 import org.vmmagic.unboxed.Address;
 import org.vmmagic.unboxed.Offset;
+import org.vmmagic.pragma.NonMoving;
 import org.vmmagic.pragma.Uninterruptible;
 import org.vmmagic.pragma.Entrypoint;
 import org.vmmagic.pragma.Untraced;
@@ -84,6 +85,7 @@
  * @see Monitor
  * @see Lock */
 @Uninterruptible
+@NonMoving
 public final class SpinLock implements Constants {
   /**
    * Should contending <code>RVMThread</code>s spin on thread local addresses (true)