---

yaml
---
r: 14329
b: refs/heads/try
c: 96af6f0
h: refs/heads/master
i:
  14327: 3b7ae02
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 601f7144d842dca97440d34774b5ae4c839a43c4
+refs/heads/try: 96af6f05a1881ba669637d3982a0d3315722c0d2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_port_selector.cpp

@@ -26,8 +26,11 @@ rust_port_selector::select(rust_task *task, rust_port **dptr,
     // block the task before any of them can try to send another
     // message.
 
+    // Start looking for ports from a different index each time.
+    size_t j = isaac_rand(&task->thread->rctx);
     for (size_t i = 0; i < n_ports; i++) {
-	rust_port *port = ports[i];
+	size_t k = (i + j) % n_ports;
+	rust_port *port = ports[k];
 	I(task->thread, port != NULL);
 
 	port->lock.lock();
@@ -50,7 +53,8 @@ rust_port_selector::select(rust_task *task, rust_port **dptr,
     }
 
     for (size_t i = 0; i < locks_taken; i++) {
-	rust_port *port = ports[i];
+	size_t k = (i + j) % n_ports;
+	rust_port *port = ports[k];
 	port->lock.unlock();
     }
 }