Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
ac1e3675
Commit
ac1e3675
authored
Jun 22, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the setup/teardown of requests vary prediction space from
cache_hash to cache_center.
parent
cdeea123
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
12 deletions
+15
-12
cache_center.c
bin/varnishd/cache_center.c
+15
-0
cache_hash.c
bin/varnishd/cache_hash.c
+0
-12
No files found.
bin/varnishd/cache_center.c
View file @
ac1e3675
...
...
@@ -1028,13 +1028,28 @@ cnt_lookup(struct sess *sp)
struct
objcore
*
oc
;
struct
object
*
o
;
struct
objhead
*
oh
;
struct
worker
*
wrk
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
->
vcl
,
VCL_CONF_MAGIC
);
wrk
=
sp
->
wrk
;
AZ
(
wrk
->
vary_b
);
AZ
(
wrk
->
vary_l
);
AZ
(
wrk
->
vary_e
);
(
void
)
WS_Reserve
(
wrk
->
ws
,
0
);
wrk
->
vary_b
=
(
void
*
)
wrk
->
ws
->
f
;
wrk
->
vary_e
=
(
void
*
)
wrk
->
ws
->
r
;
wrk
->
vary_b
[
2
]
=
'\0'
;
oc
=
HSH_Lookup
(
sp
,
&
oh
);
WS_Release
(
wrk
->
ws
,
0
);
wrk
->
vary_b
=
NULL
;
wrk
->
vary_l
=
NULL
;
wrk
->
vary_e
=
NULL
;
if
(
oc
==
NULL
)
{
/*
* We lost the session to a busy object, disembark the
...
...
bin/varnishd/cache_hash.c
View file @
ac1e3675
...
...
@@ -330,13 +330,6 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
}
CHECK_OBJ_NOTNULL
(
oh
,
OBJHEAD_MAGIC
);
AZ
(
sp
->
wrk
->
vary_b
);
AZ
(
sp
->
wrk
->
vary_l
);
AZ
(
sp
->
wrk
->
vary_e
);
WS_Reserve
(
sp
->
wrk
->
ws
,
0
);
sp
->
wrk
->
vary_b
=
(
void
*
)
sp
->
wrk
->
ws
->
f
;
sp
->
wrk
->
vary_e
=
(
void
*
)
sp
->
wrk
->
ws
->
r
;
sp
->
wrk
->
vary_b
[
2
]
=
'\0'
;
Lck_Lock
(
&
oh
->
mtx
);
assert
(
oh
->
refcnt
>
0
);
busy_oc
=
NULL
;
...
...
@@ -381,11 +374,6 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
}
}
WS_ReleaseP
(
sp
->
wrk
->
ws
,
(
void
*
)
sp
->
wrk
->
vary_b
);
sp
->
wrk
->
vary_b
=
NULL
;
sp
->
wrk
->
vary_l
=
NULL
;
sp
->
wrk
->
vary_e
=
NULL
;
/*
* If we have seen a busy object or the backend is unhealthy, and
* we have an object in grace, use it, if req.grace is also
...
...
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