Properly respect priority among multiple tubes.

echou · Jan 17, 2009 · 3427936 · 3427936
1 parent f1d7aca
commit 3427936
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/prot.c b/prot.c
@@ -373,7 +373,7 @@ next_eligible_job()
  t->name, t->waiting.used, t->ready.used);
  if (t->waiting.used && t->ready.used) {
  candidate = pq_peek(&t->ready);
- if (!j || candidate->id < j->id) j = candidate;
+ if (!j || job_pri_cmp(candidate, j) < 0) j = candidate;
  }
  dprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);
  }

diff --git a/sh-tests/multi-tube.commands b/sh-tests/multi-tube.commands
@@ -0,0 +1,9 @@
+use abc
+put 999999 0 0 0
+
+use def
+put 99 0 0 0
+
+watch abc
+watch def
+reserve
diff --git a/sh-tests/multi-tube.expected b/sh-tests/multi-tube.expected
@@ -0,0 +1,8 @@
+USING abc
+INSERTED 1
+USING def
+INSERTED 2
+WATCHING 2
+WATCHING 3
+RESERVED 2 0
+