aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-21 16:26:27 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-21 16:44:08 -0400
commitbdce67bc2babc2e5b3b2440964e9cf819ac814dc (patch)
tree47e4f7c90f1310fc398c5cdbf1e48339d3209764 /include
parent5b73afc4eb1b0303cb92eb29a2ecc59c1db69537 (diff)
GSN-EDF: Use binary heap instead of binomial heap.
Use binary heap to track CPU priorities.
Diffstat (limited to 'include')
-rw-r--r--include/litmus/binheap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/litmus/binheap.h b/include/litmus/binheap.h
index b8dd8e03da60..9fe5dc13d032 100644
--- a/include/litmus/binheap.h
+++ b/include/litmus/binheap.h
@@ -36,7 +36,7 @@ struct binheap_node {
36 * Signature of compator function. Assumed 'less-than' (min-heap). 36 * Signature of compator function. Assumed 'less-than' (min-heap).
37 * Pass in 'greater-than' for max-heap. 37 * Pass in 'greater-than' for max-heap.
38 * 38 *
39 * TODO: Consider macor-based implementation that allows comparator to be 39 * TODO: Consider macro-based implementation that allows comparator to be
40 * inlined (similar to Linux red/black tree) for greater efficiency. 40 * inlined (similar to Linux red/black tree) for greater efficiency.
41 */ 41 */
42typedef int (*binheap_order_t)(struct binheap_node *a, 42typedef int (*binheap_order_t)(struct binheap_node *a,
@@ -364,7 +364,7 @@ static inline void __binheap_add(struct binheap_node *new_node,
364{ 364{
365 /* NULL data pointers are used internally */ 365 /* NULL data pointers are used internally */
366 if(!data) { 366 if(!data) {
367 WARN(); 367 WARN_ON(!data);
368 return; 368 return;
369 } 369 }
370 370