Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
varnishevent3
Commits
b6633c0b
Commit
b6633c0b
authored
Feb 09, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BINHEAP_NOIDX should come from the binheap implementation.
Now it does.
parent
195fa50c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
8 deletions
+2
-8
cache_expire.c
bin/varnishd/cache_expire.c
+0
-7
binary_heap.h
include/binary_heap.h
+1
-0
binary_heap.c
lib/libvarnish/binary_heap.c
+1
-1
No files found.
bin/varnishd/cache_expire.c
View file @
b6633c0b
...
@@ -57,13 +57,6 @@ static pthread_t exp_thread;
...
@@ -57,13 +57,6 @@ static pthread_t exp_thread;
static
struct
binheap
*
exp_heap
;
static
struct
binheap
*
exp_heap
;
static
struct
lock
exp_mtx
;
static
struct
lock
exp_mtx
;
/*
* This is a magic marker for the objects currently on the SIOP [look it up]
* so that other users of the object will not stumble trying to change the
* ttl or lru position.
*/
#define BINHEAP_NOIDX 0
/* XXX: should be in binary_heap.h */
/*--------------------------------------------------------------------
/*--------------------------------------------------------------------
* When & why does the timer fire for this object ?
* When & why does the timer fire for this object ?
*/
*/
...
...
include/binary_heap.h
View file @
b6633c0b
...
@@ -79,3 +79,4 @@ void *binheap_root(const struct binheap *);
...
@@ -79,3 +79,4 @@ void *binheap_root(const struct binheap *);
* Return the root item
* Return the root item
*/
*/
#define BINHEAP_NOIDX 0
lib/libvarnish/binary_heap.c
View file @
b6633c0b
...
@@ -351,7 +351,7 @@ binheap_delete(struct binheap *bh, unsigned idx)
...
@@ -351,7 +351,7 @@ binheap_delete(struct binheap *bh, unsigned idx)
assert
(
idx
<
bh
->
next
);
assert
(
idx
<
bh
->
next
);
assert
(
idx
>
0
);
assert
(
idx
>
0
);
assert
(
A
(
bh
,
idx
)
!=
NULL
);
assert
(
A
(
bh
,
idx
)
!=
NULL
);
bh
->
update
(
bh
->
priv
,
A
(
bh
,
idx
),
0
);
bh
->
update
(
bh
->
priv
,
A
(
bh
,
idx
),
BINHEAP_NOIDX
);
if
(
idx
==
--
bh
->
next
)
{
if
(
idx
==
--
bh
->
next
)
{
A
(
bh
,
bh
->
next
)
=
NULL
;
A
(
bh
,
bh
->
next
)
=
NULL
;
return
;
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment