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
4571689f
Commit
4571689f
authored
Sep 18, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shave 16 bytes of the session memory requirement by putting the
sockaddr's directly into struct sess.
parent
4f610d3a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
21 deletions
+23
-21
cache.h
bin/varnishd/cache.h
+2
-2
cache_acceptor.c
bin/varnishd/cache_acceptor.c
+4
-4
cache_session.c
bin/varnishd/cache_session.c
+3
-6
cache_vrt_var.c
bin/varnishd/cache_vrt_var.c
+13
-8
generate.py
lib/libvcl/generate.py
+1
-1
No files found.
bin/varnishd/cache.h
View file @
4571689f
...
...
@@ -548,8 +548,8 @@ struct sess {
socklen_t
sockaddrlen
;
socklen_t
mysockaddrlen
;
struct
sockaddr_storage
*
sockaddr
;
struct
sockaddr_storage
*
mysockaddr
;
struct
sockaddr_storage
sockaddr
;
struct
sockaddr_storage
mysockaddr
;
struct
listen_sock
*
mylsock
;
/* formatted ascii client address */
...
...
bin/varnishd/cache_acceptor.c
View file @
4571689f
...
...
@@ -122,13 +122,13 @@ VCA_Prep(struct sess *sp)
char
addr
[
VTCP_ADDRBUFSIZE
];
char
port
[
VTCP_PORTBUFSIZE
];
VTCP_name
(
sp
->
sockaddr
,
sp
->
sockaddrlen
,
VTCP_name
(
&
sp
->
sockaddr
,
sp
->
sockaddrlen
,
addr
,
sizeof
addr
,
port
,
sizeof
port
);
sp
->
addr
=
WS_Dup
(
sp
->
ws
,
addr
);
sp
->
port
=
WS_Dup
(
sp
->
ws
,
port
);
if
(
params
->
log_local_addr
)
{
AZ
(
getsockname
(
sp
->
fd
,
(
void
*
)
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
));
VTCP_name
(
sp
->
mysockaddr
,
sp
->
mysockaddrlen
,
AZ
(
getsockname
(
sp
->
fd
,
(
void
*
)
&
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
));
VTCP_name
(
&
sp
->
mysockaddr
,
sp
->
mysockaddrlen
,
addr
,
sizeof
addr
,
port
,
sizeof
port
);
VSL
(
SLT_SessionOpen
,
sp
->
fd
,
"%s %s %s %s"
,
sp
->
addr
,
sp
->
port
,
addr
,
port
);
...
...
@@ -264,7 +264,7 @@ VCA_SetupSess(struct worker *w)
sp
->
t_end
=
sp
->
t_end
;
sp
->
mylsock
=
w
->
acceptlsock
;
assert
(
w
->
acceptaddrlen
<=
sp
->
sockaddrlen
);
memcpy
(
sp
->
sockaddr
,
&
w
->
acceptaddr
,
w
->
acceptaddrlen
);
memcpy
(
&
sp
->
sockaddr
,
&
w
->
acceptaddr
,
w
->
acceptaddrlen
);
sp
->
sockaddrlen
=
w
->
acceptaddrlen
;
sp
->
step
=
STP_FIRST
;
vca_pace_good
();
...
...
bin/varnishd/cache_session.c
View file @
4571689f
...
...
@@ -56,7 +56,6 @@ struct sessmem {
void
*
wsp
;
struct
http
*
http
[
2
];
VTAILQ_ENTRY
(
sessmem
)
list
;
struct
sockaddr_storage
sockaddr
[
2
];
};
struct
sesspool
{
...
...
@@ -152,11 +151,9 @@ ses_setup(struct sessmem *sm)
sp
->
magic
=
SESS_MAGIC
;
sp
->
mem
=
sm
;
sp
->
sockaddr
=
(
void
*
)(
&
sm
->
sockaddr
[
0
]);
sp
->
sockaddrlen
=
sizeof
(
sm
->
sockaddr
[
0
]);
sp
->
mysockaddr
=
(
void
*
)(
&
sm
->
sockaddr
[
1
]);
sp
->
mysockaddrlen
=
sizeof
(
sm
->
sockaddr
[
1
]);
sp
->
sockaddr
->
ss_family
=
sp
->
mysockaddr
->
ss_family
=
PF_UNSPEC
;
sp
->
sockaddrlen
=
sizeof
(
sp
->
sockaddr
);
sp
->
mysockaddrlen
=
sizeof
(
sp
->
mysockaddr
);
sp
->
sockaddr
.
ss_family
=
sp
->
mysockaddr
.
ss_family
=
PF_UNSPEC
;
sp
->
t_open
=
NAN
;
sp
->
t_req
=
NAN
;
sp
->
t_resp
=
NAN
;
...
...
bin/varnishd/cache_vrt_var.c
View file @
4571689f
...
...
@@ -457,10 +457,10 @@ REQ_BOOL(hash_always_miss)
/*--------------------------------------------------------------------*/
struct
sockaddr_storage
*
VRT_r_client_ip
(
const
struct
sess
*
sp
)
VRT_r_client_ip
(
struct
sess
*
sp
)
{
return
(
sp
->
sockaddr
);
return
(
&
sp
->
sockaddr
);
}
struct
sockaddr_storage
*
...
...
@@ -468,12 +468,13 @@ VRT_r_server_ip(struct sess *sp)
{
int
i
;
if
(
sp
->
mysockaddr
->
ss_family
==
AF_UNSPEC
)
{
i
=
getsockname
(
sp
->
fd
,
(
void
*
)
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
);
if
(
sp
->
mysockaddr
.
ss_family
==
AF_UNSPEC
)
{
i
=
getsockname
(
sp
->
fd
,
(
void
*
)
&
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
);
assert
(
VTCP_Check
(
i
));
}
return
(
sp
->
mysockaddr
);
return
(
&
sp
->
mysockaddr
);
}
const
char
*
...
...
@@ -506,10 +507,14 @@ VRT_r_server_hostname(struct sess *sp)
int
VRT_r_server_port
(
struct
sess
*
sp
)
{
int
i
;
if
(
sp
->
mysockaddr
->
ss_family
==
AF_UNSPEC
)
AZ
(
getsockname
(
sp
->
fd
,
(
void
*
)
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
));
return
(
VTCP_port
(
sp
->
mysockaddr
));
if
(
sp
->
mysockaddr
.
ss_family
==
AF_UNSPEC
)
{
i
=
getsockname
(
sp
->
fd
,
(
void
*
)
&
sp
->
mysockaddr
,
&
sp
->
mysockaddrlen
);
assert
(
VTCP_Check
(
i
));
}
return
(
VTCP_port
(
&
sp
->
mysockaddr
));
}
/*--------------------------------------------------------------------*/
...
...
lib/libvcl/generate.py
View file @
4571689f
...
...
@@ -107,7 +107,7 @@ sp_variables = (
'IP'
,
(
'proc'
,),
(
),
'
const
struct sess *'
'struct sess *'
),
(
'client.identity'
,
'STRING'
,
...
...
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