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
ffb8801b
Commit
ffb8801b
authored
Dec 20, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify the dance around sock acceptance.
parent
8624d492
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
17 deletions
+37
-17
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_acceptor.c
bin/varnishd/cache/cache_acceptor.c
+29
-11
cache_center.c
bin/varnishd/cache/cache_center.c
+0
-2
cache_pool.c
bin/varnishd/cache/cache_pool.c
+7
-3
No files found.
bin/varnishd/cache/cache.h
View file @
ffb8801b
...
...
@@ -293,6 +293,7 @@ enum e_do_what {
pool_do_inval
=
0
,
pool_do_sess
,
pool_do_accept
,
pool_do_nothing
,
pool_do_die
,
};
...
...
@@ -662,7 +663,6 @@ struct sess {
/* Prototypes etc ----------------------------------------------------*/
/* cache_acceptor.c */
void
VCA_Prep
(
const
struct
sess
*
sp
);
void
VCA_Init
(
void
);
void
VCA_Shutdown
(
void
);
int
VCA_Accept
(
struct
listen_sock
*
ls
,
struct
wrk_accept
*
wa
);
...
...
bin/varnishd/cache/cache_acceptor.c
View file @
ffb8801b
...
...
@@ -26,6 +26,17 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This source file has the various trickery surrounding the accept/listen
* sockets.
*
* The actual acceptance is done from cache_pool.c, by calling
* into VCA_Accept() in this file.
*
* Once the session is allocated we move into it with a call to
* VCA_SetupSess().
*
* If we fail to allocate a session we call VCA_FailSess() to clean up
* and initiate pacing.
*/
#include "config.h"
...
...
@@ -41,6 +52,9 @@
static
pthread_t
VCA_thread
;
static
struct
timeval
tv_sndtimeo
;
static
struct
timeval
tv_rcvtimeo
;
static
int
hack_ready
;
static
double
vca_pace
=
0
.
0
;
static
struct
lock
pace_mtx
;
/*--------------------------------------------------------------------
* We want to get out of any kind of trouble-hit TCP connections as fast
...
...
@@ -54,6 +68,12 @@ static const struct linger linger = {
static
unsigned
char
need_sndtimeo
,
need_rcvtimeo
,
need_linger
,
need_test
;
/*--------------------------------------------------------------------
* Some kernels have bugs/limitations with respect to which options are
* inherited from the accept/listen socket, so we have to keep track of
* which, if any, sockopts we have to set on the accepted socket.
*/
static
void
sock_test
(
int
fd
)
{
...
...
@@ -108,12 +128,12 @@ sock_test(int fd)
}
/*--------------------------------------------------------------------
* Called once the workerthread gets hold of the session, to
do set
up
*
setup overhead, we don't want to bother the acceptor thread with
.
* Called once the workerthread gets hold of the session, to
fix
up
*
any socket options that need it
.
*/
void
VCA_P
rep
(
const
struct
sess
*
sp
)
static
void
vca_p
rep
(
const
struct
sess
*
sp
)
{
if
(
need_test
)
...
...
@@ -138,9 +158,6 @@ VCA_Prep(const struct sess *sp)
* shortage if possible.
*/
static
double
vca_pace
=
0
.
0
;
static
struct
lock
pace_mtx
;
static
void
vca_pace_check
(
void
)
{
...
...
@@ -183,8 +200,6 @@ vca_pace_good(void)
* Accept on a listen socket, and handle error returns.
*/
static
int
hack_ready
;
int
VCA_Accept
(
struct
listen_sock
*
ls
,
struct
wrk_accept
*
wa
)
{
...
...
@@ -243,7 +258,9 @@ VCA_FailSess(struct worker *w)
vca_pace_bad
();
}
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------
* We have allocated a session, move our info into it.
*/
void
VCA_SetupSess
(
struct
worker
*
w
)
...
...
@@ -268,6 +285,7 @@ VCA_SetupSess(struct worker *w)
sp
->
step
=
STP_FIRST
;
vca_pace_good
();
w
->
stats
.
sess_conn
++
;
vca_prep
(
sp
);
}
/*--------------------------------------------------------------------*/
...
...
@@ -363,7 +381,7 @@ ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
/*
* This CLI command is primarily used by varnishtest. Don't
* respond until liste(2) has been called, in order to avoid
* respond until liste
n
(2) has been called, in order to avoid
* a race where varnishtest::client would attempt to connect(2)
* before listen(2) has been called.
*/
...
...
bin/varnishd/cache/cache_center.c
View file @
ffb8801b
...
...
@@ -1039,8 +1039,6 @@ cnt_first(struct sess *sp)
}
sp
->
acct_ses
.
first
=
sp
->
t_open
;
VCA_Prep
(
sp
);
/* Record the session watermark */
sp
->
ws_ses
=
WS_Snapshot
(
sp
->
ws
);
...
...
bin/varnishd/cache/cache_pool.c
View file @
ffb8801b
...
...
@@ -239,12 +239,14 @@ Pool_Work_Thread(void *priv, struct worker *w)
AZ
(
w
->
sp
);
AN
(
w
->
ws
->
r
);
w
->
sp
=
SES_New
(
w
,
pp
->
sesspool
);
if
(
w
->
sp
==
NULL
)
if
(
w
->
sp
==
NULL
)
{
VCA_FailSess
(
w
);
else
w
->
do_what
=
pool_do_nothing
;
}
else
{
VCA_SetupSess
(
w
);
w
->
do_what
=
pool_do_sess
;
}
WS_Release
(
w
->
ws
,
0
);
w
->
do_what
=
pool_do_sess
;
}
if
(
w
->
do_what
==
pool_do_sess
)
{
...
...
@@ -272,6 +274,8 @@ Pool_Work_Thread(void *priv, struct worker *w)
if
(
w
->
vcl
!=
NULL
)
VCL_Rel
(
&
w
->
vcl
);
}
}
else
if
(
w
->
do_what
==
pool_do_nothing
)
{
/* we already did */
}
else
{
WRONG
(
"Invalid w->do_what"
);
}
...
...
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