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
4f15e168
Commit
4f15e168
authored
Jun 19, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move cnt_first{} up above cnt_wait{}, this is a more logical order
and will make subsequent diffs clearer.
parent
99d67512
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
52 additions
and
52 deletions
+52
-52
cache_center.c
bin/varnishd/cache/cache_center.c
+52
-52
No files found.
bin/varnishd/cache/cache_center.c
View file @
4f15e168
...
...
@@ -79,6 +79,58 @@ DOT acceptor -> first [style=bold,color=green]
static
unsigned
xids
;
/*--------------------------------------------------------------------
* A freshly accepted socket
*
DOT subgraph xcluster_first {
DOT first [
DOT shape=box
DOT label="cnt_first:\nrender\naddresses"
DOT ]
DOT }
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
];
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
/* Allocate a request already now, so we can VSL to it */
AZ
(
sp
->
req
);
req
=
SES_GetReq
(
sp
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
assert
(
req
->
sp
==
sp
);
VTCP_name
(
&
sp
->
sockaddr
,
sp
->
sockaddrlen
,
sp
->
addr
,
sizeof
sp
->
addr
,
sp
->
port
,
sizeof
sp
->
port
);
if
(
cache_param
->
log_local_addr
)
{
AZ
(
getsockname
(
sp
->
fd
,
(
void
*
)
&
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
));
VTCP_name
(
&
sp
->
mysockaddr
,
sp
->
mysockaddrlen
,
laddr
,
sizeof
laddr
,
lport
,
sizeof
lport
);
/* XXX: have no req yet */
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s %s"
,
sp
->
addr
,
sp
->
port
,
laddr
,
lport
);
}
else
{
/* XXX: have no req yet */
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s"
,
sp
->
addr
,
sp
->
port
,
sp
->
mylsock
->
name
);
}
wrk
->
acct_tmp
.
sess
++
;
sp
->
t_rx
=
sp
->
t_open
;
sp
->
t_idle
=
sp
->
t_open
;
sp
->
step
=
STP_WAIT
;
return
(
0
);
}
/*--------------------------------------------------------------------
* WAIT
* Collect the request from the client.
...
...
@@ -915,58 +967,6 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
return
(
0
);
}
/*--------------------------------------------------------------------
* A freshly accepted socket
*
DOT subgraph xcluster_first {
DOT first [
DOT shape=box
DOT label="cnt_first:\nrender\naddresses"
DOT ]
DOT }
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
];
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
/* Allocate a request already now, so we can VSL to it */
AZ
(
sp
->
req
);
req
=
SES_GetReq
(
sp
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
assert
(
req
->
sp
==
sp
);
VTCP_name
(
&
sp
->
sockaddr
,
sp
->
sockaddrlen
,
sp
->
addr
,
sizeof
sp
->
addr
,
sp
->
port
,
sizeof
sp
->
port
);
if
(
cache_param
->
log_local_addr
)
{
AZ
(
getsockname
(
sp
->
fd
,
(
void
*
)
&
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
));
VTCP_name
(
&
sp
->
mysockaddr
,
sp
->
mysockaddrlen
,
laddr
,
sizeof
laddr
,
lport
,
sizeof
lport
);
/* XXX: have no req yet */
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s %s"
,
sp
->
addr
,
sp
->
port
,
laddr
,
lport
);
}
else
{
/* XXX: have no req yet */
VSLb
(
req
->
vsl
,
SLT_SessionOpen
,
"%s %s %s"
,
sp
->
addr
,
sp
->
port
,
sp
->
mylsock
->
name
);
}
wrk
->
acct_tmp
.
sess
++
;
sp
->
t_rx
=
sp
->
t_open
;
sp
->
t_idle
=
sp
->
t_open
;
sp
->
step
=
STP_WAIT
;
return
(
0
);
}
/*--------------------------------------------------------------------
* HIT
* We had a cache hit. Ask VCL, then march off as instructed.
...
...
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