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
bbf9e25b
Commit
bbf9e25b
authored
Jan 12, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change calling convenction of WAIT_Enter() to be sess agnostic
parent
f1da3c43
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
cache_session.c
bin/varnishd/cache/cache_session.c
+1
-1
cache_waiter.c
bin/varnishd/waiter/cache_waiter.c
+4
-2
waiter.h
bin/varnishd/waiter/waiter.h
+1
-1
No files found.
bin/varnishd/cache/cache_session.c
View file @
bbf9e25b
...
...
@@ -288,7 +288,7 @@ SES_Wait(struct sess *sp)
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
pp
=
sp
->
sesspool
;
CHECK_OBJ_NOTNULL
(
pp
,
SESSPOOL_MAGIC
);
if
(
WAIT_Enter
(
pp
->
http1_waiter
,
sp
))
{
if
(
WAIT_Enter
(
pp
->
http1_waiter
,
sp
,
sp
->
fd
))
{
VSC_C_main
->
sess_pipe_overflow
++
;
SES_Delete
(
sp
,
SC_SESS_PIPE_OVERFLOW
,
NAN
);
}
...
...
bin/varnishd/waiter/cache_waiter.c
View file @
bbf9e25b
...
...
@@ -74,11 +74,13 @@ WAIT_Init(waiter_handle_f *func)
}
int
WAIT_Enter
(
const
struct
waiter
*
w
,
struct
sess
*
sp
)
WAIT_Enter
(
const
struct
waiter
*
w
,
void
*
ptr
,
int
fd
)
{
struct
sess
*
sp
;
CHECK_OBJ_NOTNULL
(
w
,
WAITER_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CAST_OBJ_NOTNULL
(
sp
,
ptr
,
SESS_MAGIC
);
assert
(
fd
>=
0
);
assert
(
sp
->
fd
>=
0
);
return
(
w
->
impl
->
pass
(
w
->
priv
,
sp
));
...
...
bin/varnishd/waiter/waiter.h
View file @
bbf9e25b
...
...
@@ -50,7 +50,7 @@ struct waiter_impl {
};
/* cache_waiter.c */
int
WAIT_Enter
(
const
struct
waiter
*
,
struct
sess
*
sp
);
int
WAIT_Enter
(
const
struct
waiter
*
,
void
*
ptr
,
int
fd
);
struct
waiter
*
WAIT_Init
(
waiter_handle_f
*
);
const
char
*
WAIT_GetName
(
void
);
int
WAIT_Write_Session
(
struct
sess
*
sp
,
int
fd
);
...
...
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