MRP-10, support for thread priorities.

codehaus · Jun 1, 2009 · bee0139 · bee0139
1 parent f825483
commit bee0139
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/rvm/src/org/jikesrvm/runtime/BootRecord.java b/rvm/src/org/jikesrvm/runtime/BootRecord.java
@@ -250,6 +250,7 @@ public void setHeapRange(int id, Address start, Address end) {
   public Address sysThreadBindSupportedIP;
   public Address sysThreadBindIP;
   public Address sysThreadCreateIP;
+  public Address sysThreadSetPriorityIP;
   public Address sysThreadYieldIP;
   public Address sysThreadSelfIP;
   public Address sysStashVMThreadIP;

diff --git a/rvm/src/org/jikesrvm/runtime/SysCall.java b/rvm/src/org/jikesrvm/runtime/SysCall.java
@@ -164,6 +164,10 @@ public abstract class SysCall {
   @SysCallTemplate
   public abstract void sysThreadBind(int cpuId);
 
+
+  @SysCallTemplate
+  public abstract void sysThreadSetPriority(Address thread, int priority);
+
   @SysCallTemplate
   public abstract void sysThreadYield();
 

diff --git a/rvm/src/org/jikesrvm/scheduler/RVMThread.java b/rvm/src/org/jikesrvm/scheduler/RVMThread.java
@@ -4101,8 +4101,10 @@ public final int getPriority() {
    * @see java.lang.Thread#getPriority()
    */
   public final void setPriority(int priority) {
+    if (priority < 0) priority = 0;
+    else if (priority > 10) priority = 10;
     this.priority = priority;
-    // @TODO this should be calling a syscall
+    sysCall.sysThreadSetPriority(pthread_id, priority);
   }
 
   /**

diff --git a/tools/bootloader/sys.h b/tools/bootloader/sys.h
@@ -280,6 +280,7 @@ EXTERNAL void sysThreadTerminate();
 EXTERNAL int sysThreadBindSupported();
 EXTERNAL void sysThreadBind(int UNUSED cpuId);
 EXTERNAL Address sysThreadSelf();
+EXTERNAL void sysThreadSetPriority(Address thread, int priority);
 EXTERNAL void sysThreadYield();
 EXTERNAL void sysNanoSleep(long long howLongNanos);
 EXTERNAL Address sysMonitorCreate();

diff --git a/tools/bootloader/sysThread.c b/tools/bootloader/sysThread.c
@@ -585,6 +585,22 @@ EXTERNAL Address sysThreadSelf()
   return (Address)thread;
 }
 
+/**
+ * Set priority of thread to
+ * @param thread [in] thread to change priority of
+ * @param priority [in] new priority (range of 0 to 10)
+ */
+EXTERNAL void sysThreadSetPriority(Address thread, int priority)
+{
+  SYS_START();
+  TRACE_PRINTF("%s: sysThreadSetPriority: thread %p %d\n", Me, thread, priority);
+#ifdef RVM_FOR_HARMONY
+  hythread_set_priority((hythread_t)thread, priority);
+#else
+  pthread_setschedprio((pthread_t)thread, priority - 5);
+#endif
+}
+
 /**
  * Yield execution of current thread back to o/s.
  */