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
5011af25
Commit
5011af25
authored
Jun 04, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some asserts to narrow #1147 and #1148 down
parent
344a709c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
cache_center.c
bin/varnishd/cache/cache_center.c
+8
-4
cache_vcl.c
bin/varnishd/cache/cache_vcl.c
+2
-0
No files found.
bin/varnishd/cache/cache_center.c
View file @
5011af25
...
...
@@ -116,6 +116,7 @@ cnt_wait(struct sess *sp, struct worker *wrk, struct req *req)
SES_GetReq
(
sp
);
req
=
sp
->
req
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
assert
(
req
->
sp
==
sp
);
HTC_Init
(
req
->
htc
,
req
->
ws
,
sp
->
fd
,
sp
->
req
->
vsl
,
cache_param
->
http_req_size
,
cache_param
->
http_req_hdr_len
);
...
...
@@ -928,6 +929,7 @@ DOT first -> wait [style=bold,color=green]
static
int
cnt_first
(
struct
sess
*
sp
,
struct
worker
*
wrk
)
{
struct
req
*
req
;
char
laddr
[
ADDR_BUFSIZE
];
char
lport
[
PORT_BUFSIZE
];
...
...
@@ -936,8 +938,10 @@ cnt_first(struct sess *sp, struct worker *wrk)
/* Allocate a request already now, so we can VSL to it */
SES_GetReq
(
sp
);
CHECK_OBJ_NOTNULL
(
sp
->
req
,
REQ_MAGIC
);
HTC_Init
(
sp
->
req
->
htc
,
sp
->
req
->
ws
,
sp
->
fd
,
sp
->
req
->
vsl
,
req
=
sp
->
req
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
assert
(
req
->
sp
==
sp
);
HTC_Init
(
req
->
htc
,
req
->
ws
,
sp
->
fd
,
req
->
vsl
,
cache_param
->
http_req_size
,
cache_param
->
http_req_hdr_len
);
...
...
@@ -949,11 +953,11 @@ cnt_first(struct sess *sp, struct worker *wrk)
VTCP_name
(
&
sp
->
mysockaddr
,
sp
->
mysockaddrlen
,
laddr
,
sizeof
laddr
,
lport
,
sizeof
lport
);
/* XXX: have no req yet */
VSLb
(
sp
->
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s %s"
,
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s %s"
,
sp
->
addr
,
sp
->
port
,
laddr
,
lport
);
}
else
{
/* XXX: have no req yet */
VSLb
(
sp
->
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s"
,
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s"
,
sp
->
addr
,
sp
->
port
,
sp
->
mylsock
->
name
);
}
...
...
bin/varnishd/cache/cache_vcl.c
View file @
5011af25
...
...
@@ -338,6 +338,8 @@ void \
VCL_##func##_method(struct req *req) \
{ \
\
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); \
CHECK_OBJ_NOTNULL(req->sp, SESS_MAGIC); \
req->handling = 0; \
req->cur_method = VCL_MET_ ## upper; \
VSLb(req->vsl, SLT_VCL_call, "%s", #func); \
...
...
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