ms-queuedaemon: Support infra-priority

This will allow a flight to order the queueing its own test jobs more
sensibly without interfering with inter-flight priority.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/README.planner b/README.planner
index fec7482614c74aa4896823088e36a0ad8d503091..c33aae117d6f66273e6a75cec41feb5fd1900983 100644 (file)
--- a/README.planner
+++ b/README.planner
@@ -238,6 +238,7 @@ ms-queuedaemon commands
         > set-info priority ...                      } used for
         > set-info sub-priority ...                  } queue adjustment
         > set-info wait-start-adjust ...             }
+        > set-info infra-priority ...                }
 
         > set-info feature-noalloc 1
                The client understands `!OK think noalloc'.

diff --git a/ms-queuedaemon b/ms-queuedaemon
index 430860a5333ecae04f6e3fea237e25e341e58393..f02abf377ade326fdf796ebb528981b419f68b53 100755 (executable)
--- a/ms-queuedaemon
+++ b/ms-queuedaemon
@@ -599,15 +599,17 @@ proc chan-order-key {chan} {
 
     set priority [chan-get-info $chan {int($info(priority))} 0]
     set subpriority [chan-get-info $chan {int($info(sub-priority))} 0]
+    set infrapriority [chan-get-info $chan {int($info(infra-priority))} 0]
 
     set waitstart "$info(wait-start use)"
     incr waitstart [chan-get-info $chan {int($info(wait-start-adjust))} 0]
 
     #puts stderr "priority $chan $priority $emsg"
-    return [format "%011d.%011d.%011d" \
+    return [format "%011d.%011d.%011d.%011d" \
                 [expr {$priority+1000000000}] \
                 [expr {$subpriority+1000000000}] \
-                $waitstart]
+                $waitstart \
+                [expr {$infrapriority+1000000000}]]
 }
 
 proc cmd/prod {chan desc} {