Changeset b6633c0


Ignore:
Timestamp:
2011-02-09 14:00:16 (3 years ago)
Author:
Poul-Henning Kamp <phk@…>
Branches:
master, 3.0, 4.0, experimental-ims
Children:
abf653
Parents:
195fa5
git-author:
Poul-Henning Kamp <phk@…> (2011-02-09 14:00:16)
git-committer:
Poul-Henning Kamp <phk@…> (2011-02-09 14:00:16)
Message:

BINHEAP_NOIDX should come from the binheap implementation.

Now it does.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bin/varnishd/cache_expire.c

    r195fa5 rb6633c0  
    5757static struct binheap *exp_heap; 
    5858static struct lock exp_mtx; 
    59  
    60 /* 
    61  * This is a magic marker for the objects currently on the SIOP [look it up] 
    62  * so that other users of the object will not stumble trying to change the 
    63  * ttl or lru position. 
    64  */ 
    65 #define BINHEAP_NOIDX 0         /* XXX: should be in binary_heap.h */ 
    6659 
    6760/*-------------------------------------------------------------------- 
  • include/binary_heap.h

    r61e8ab rb6633c0  
    8080         */ 
    8181 
     82#define BINHEAP_NOIDX   0 
  • lib/libvarnish/binary_heap.c

    r61e8ab rb6633c0  
    352352        assert(idx > 0); 
    353353        assert(A(bh, idx) != NULL); 
    354         bh->update(bh->priv, A(bh, idx), 0); 
     354        bh->update(bh->priv, A(bh, idx), BINHEAP_NOIDX); 
    355355        if (idx == --bh->next) { 
    356356                A(bh, bh->next) = NULL; 
Note: See TracChangeset for help on using the changeset viewer.