Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
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
unique-xids
Commits
4d33fabc
Commit
4d33fabc
authored
Mar 22, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce a couple of local busyobj variables for clarity
parent
4edc10c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
cache_center.c
bin/varnishd/cache/cache_center.c
+12
-7
No files found.
bin/varnishd/cache/cache_center.c
View file @
4d33fabc
...
@@ -1261,6 +1261,8 @@ XDOT err_pass [label="ERROR",shape=plaintext]
...
@@ -1261,6 +1261,8 @@ XDOT err_pass [label="ERROR",shape=plaintext]
static
int
static
int
cnt_pass
(
struct
sess
*
sp
,
struct
worker
*
wrk
,
struct
req
*
req
)
cnt_pass
(
struct
sess
*
sp
,
struct
worker
*
wrk
,
struct
req
*
req
)
{
{
struct
busyobj
*
bo
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
...
@@ -1270,15 +1272,16 @@ cnt_pass(struct sess *sp, struct worker *wrk, struct req *req)
...
@@ -1270,15 +1272,16 @@ cnt_pass(struct sess *sp, struct worker *wrk, struct req *req)
AZ
(
req
->
busyobj
);
AZ
(
req
->
busyobj
);
req
->
busyobj
=
VBO_GetBusyObj
(
wrk
);
req
->
busyobj
=
VBO_GetBusyObj
(
wrk
);
req
->
busyobj
->
vsl
->
wid
=
sp
->
vsl_id
;
bo
=
req
->
busyobj
;
req
->
busyobj
->
refcount
=
2
;
bo
->
vsl
->
wid
=
sp
->
vsl_id
;
http_Setup
(
req
->
busyobj
->
bereq
,
req
->
busyobj
->
ws
,
req
->
busyobj
->
vsl
);
bo
->
refcount
=
2
;
http_Setup
(
bo
->
bereq
,
bo
->
ws
,
bo
->
vsl
);
http_FilterReq
(
sp
,
HTTPH_R_PASS
);
http_FilterReq
(
sp
,
HTTPH_R_PASS
);
VCL_pass_method
(
sp
);
VCL_pass_method
(
sp
);
if
(
req
->
handling
==
VCL_RET_ERROR
)
{
if
(
req
->
handling
==
VCL_RET_ERROR
)
{
http_Teardown
(
req
->
busyobj
->
bereq
);
http_Teardown
(
bo
->
bereq
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
sp
->
step
=
STP_ERROR
;
sp
->
step
=
STP_ERROR
;
return
(
0
);
return
(
0
);
...
@@ -1317,6 +1320,7 @@ DOT err_pipe [label="ERROR",shape=plaintext]
...
@@ -1317,6 +1320,7 @@ DOT err_pipe [label="ERROR",shape=plaintext]
static
int
static
int
cnt_pipe
(
struct
sess
*
sp
,
struct
worker
*
wrk
,
struct
req
*
req
)
cnt_pipe
(
struct
sess
*
sp
,
struct
worker
*
wrk
,
struct
req
*
req
)
{
{
struct
busyobj
*
bo
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
...
@@ -1326,8 +1330,9 @@ cnt_pipe(struct sess *sp, struct worker *wrk, struct req *req)
...
@@ -1326,8 +1330,9 @@ cnt_pipe(struct sess *sp, struct worker *wrk, struct req *req)
wrk
->
acct_tmp
.
pipe
++
;
wrk
->
acct_tmp
.
pipe
++
;
req
->
busyobj
=
VBO_GetBusyObj
(
wrk
);
req
->
busyobj
=
VBO_GetBusyObj
(
wrk
);
req
->
busyobj
->
vsl
->
wid
=
sp
->
vsl_id
;
bo
=
req
->
busyobj
;
http_Setup
(
req
->
busyobj
->
bereq
,
req
->
busyobj
->
ws
,
req
->
busyobj
->
vsl
);
bo
->
vsl
->
wid
=
sp
->
vsl_id
;
http_Setup
(
bo
->
bereq
,
bo
->
ws
,
bo
->
vsl
);
http_FilterReq
(
sp
,
0
);
http_FilterReq
(
sp
,
0
);
VCL_pipe_method
(
sp
);
VCL_pipe_method
(
sp
);
...
@@ -1338,7 +1343,7 @@ cnt_pipe(struct sess *sp, struct worker *wrk, struct req *req)
...
@@ -1338,7 +1343,7 @@ cnt_pipe(struct sess *sp, struct worker *wrk, struct req *req)
PipeSession
(
sp
);
PipeSession
(
sp
);
assert
(
WRW_IsReleased
(
wrk
));
assert
(
WRW_IsReleased
(
wrk
));
http_Teardown
(
req
->
busyobj
->
bereq
);
http_Teardown
(
bo
->
bereq
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
sp
->
step
=
STP_DONE
;
sp
->
step
=
STP_DONE
;
return
(
0
);
return
(
0
);
...
...
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