X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpqueue.c;h=5becefa40e58811a3dbd6d9a841ecbd165a85325;hb=f864dbddcf026827e85d49544abbb002841a5405;hp=3ce0f1e3387238c91996ffdc5ccc8393c4b7fe50;hpb=960fa89873d6fd56259d4b44d5ea9541335b0232;p=libfirm diff --git a/ir/adt/pqueue.c b/ir/adt/pqueue.c index 3ce0f1e33..5becefa40 100644 --- a/ir/adt/pqueue.c +++ b/ir/adt/pqueue.c @@ -45,7 +45,7 @@ typedef struct _pqueue_el_t { void *data; - int key; + int priority; } pqueue_el_t; struct _pqueue_t { @@ -63,11 +63,12 @@ static void pqueue_heapify(pqueue_t *q, unsigned pos) { pqueue_el_t tmp; unsigned exchange = pos; - if (q->elems[exchange].key < q->elems[pos * 2].key) { + if (q->elems[exchange].priority < q->elems[pos * 2].priority) { exchange = pos * 2; } - if ((pos * 2 + 1) < len && q->elems[exchange].key < q->elems[pos * 2 + 1].key) { + if ((pos * 2 + 1) < len + && q->elems[exchange].priority < q->elems[pos * 2 + 1].priority) { exchange = pos * 2 + 1; } @@ -86,7 +87,7 @@ static void pqueue_heapify(pqueue_t *q, unsigned pos) { * Sifts up a newly inserted element at position @p pos. */ static void pqueue_sift_up(pqueue_t *q, unsigned pos) { - while(q->elems[pos].key > q->elems[pos / 2].key) { + while(q->elems[pos].priority > q->elems[pos / 2].priority) { pqueue_el_t tmp; tmp = q->elems[pos]; @@ -108,11 +109,11 @@ void del_pqueue(pqueue_t *q) { free(q); } -void pqueue_put(pqueue_t *q, void *data, int key) { +void pqueue_put(pqueue_t *q, void *data, int priority) { pqueue_el_t el; - el.data = data; - el.key = key; + el.data = data; + el.priority = priority; ARR_APP1(pqueue_el_t, q->elems, el);