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
2c90d787
Commit
2c90d787
authored
Dec 23, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant field
parent
a9852b4c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
12 deletions
+5
-12
cache.h
bin/varnishd/cache/cache.h
+0
-1
cache_center.c
bin/varnishd/cache/cache_center.c
+3
-9
cache_session.c
bin/varnishd/cache/cache_session.c
+2
-2
No files found.
bin/varnishd/cache/cache.h
View file @
2c90d787
...
...
@@ -198,7 +198,6 @@ struct http_conn {
/*--------------------------------------------------------------------*/
struct
acct
{
double
first
;
#define ACCT(foo) uint64_t foo;
#include "tbl/acct_fields.h"
#undef ACCT
...
...
bin/varnishd/cache/cache_center.c
View file @
2c90d787
...
...
@@ -1019,7 +1019,8 @@ cnt_streambody(struct sess *sp)
}
/*--------------------------------------------------------------------
* The very first request
* A freshly accepted socket
*
DOT subgraph xcluster_first {
DOT first [
DOT shape=box
...
...
@@ -1040,16 +1041,10 @@ cnt_first(struct sess *sp)
wrk
=
sp
->
wrk
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
/*
* XXX: If we don't have acceptfilters we are somewhat subject
* XXX: to DoS'ing here. One remedy would be to set a shorter
* XXX: SO_RCVTIMEO and once we have received something here
* XXX: increase it to the normal value.
*/
assert
(
sp
->
xid
==
0
);
assert
(
sp
->
restarts
==
0
);
AZ
(
sp
->
esi_level
);
VTCP_name
(
&
sp
->
sockaddr
,
sp
->
sockaddrlen
,
sp
->
addr
,
sizeof
sp
->
addr
,
sp
->
port
,
sizeof
sp
->
port
);
if
(
cache_param
->
log_local_addr
)
{
...
...
@@ -1063,7 +1058,6 @@ cnt_first(struct sess *sp)
WSP
(
sp
,
SLT_SessionOpen
,
"%s %s %s"
,
sp
->
addr
,
sp
->
port
,
sp
->
mylsock
->
name
);
}
sp
->
acct_ses
.
first
=
sp
->
t_open
;
/* Receive a HTTP protocol request */
HTC_Init
(
sp
->
htc
,
sp
->
ws
,
sp
->
fd
,
sp
->
vsl_id
,
...
...
bin/varnishd/cache/cache_session.c
View file @
2c90d787
...
...
@@ -345,6 +345,7 @@ SES_Delete(struct sess *sp, const char *reason, double now)
SES_Close
(
sp
,
reason
);
if
(
isnan
(
now
))
now
=
VTIM_real
();
assert
(
!
isnan
(
sp
->
t_open
));
assert
(
sp
->
fd
<
0
);
AZ
(
sp
->
vcl
);
...
...
@@ -354,11 +355,10 @@ SES_Delete(struct sess *sp, const char *reason, double now)
strcpy
(
sp
->
addr
,
"-"
);
b
=
&
sp
->
acct_ses
;
assert
(
!
isnan
(
b
->
first
));
VSL
(
SLT_StatSess
,
sp
->
vsl_id
,
"%s %s %.0f %ju %ju %ju %ju %ju %ju %ju"
,
sp
->
addr
,
sp
->
port
,
now
-
b
->
first
,
// XXX ???
now
-
sp
->
t_open
,
b
->
sess
,
b
->
req
,
b
->
pipe
,
b
->
pass
,
b
->
fetch
,
b
->
hdrbytes
,
b
->
bodybytes
);
...
...
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