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
f1da3c43
Commit
f1da3c43
authored
Jan 12, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement "struct waiter" for a waiter instance
parent
a0e052c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
7 deletions
+23
-7
cache_session.c
bin/varnishd/cache/cache_session.c
+1
-1
cache_waiter.c
bin/varnishd/waiter/cache_waiter.c
+19
-4
waiter.h
bin/varnishd/waiter/waiter.h
+3
-2
No files found.
bin/varnishd/cache/cache_session.c
View file @
f1da3c43
...
...
@@ -60,7 +60,7 @@ struct sesspool {
struct
mempool
*
mpl_req
;
struct
mempool
*
mpl_sess
;
void
*
http1_waiter
;
struct
waiter
*
http1_waiter
;
};
/*--------------------------------------------------------------------
...
...
bin/varnishd/waiter/cache_waiter.c
View file @
f1da3c43
...
...
@@ -30,6 +30,7 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <math.h>
...
...
@@ -38,6 +39,13 @@
#include "waiter/waiter.h"
struct
waiter
{
unsigned
magic
;
#define WAITER_MAGIC 0x17c399db
const
struct
waiter_impl
*
impl
;
void
*
priv
;
};
const
char
*
WAIT_GetName
(
void
)
{
...
...
@@ -48,25 +56,32 @@ WAIT_GetName(void)
return
(
"no_waiter"
);
}
void
*
struct
waiter
*
WAIT_Init
(
waiter_handle_f
*
func
)
{
struct
waiter
*
w
;
ALLOC_OBJ
(
w
,
WAITER_MAGIC
);
AN
(
w
);
AN
(
waiter
);
AN
(
waiter
->
name
);
AN
(
waiter
->
init
);
AN
(
waiter
->
pass
);
return
(
waiter
->
init
(
func
));
w
->
impl
=
waiter
;
w
->
priv
=
w
->
impl
->
init
(
func
);
return
(
w
);
}
int
WAIT_Enter
(
void
*
waiter_priv
,
struct
sess
*
sp
)
WAIT_Enter
(
const
struct
waiter
*
w
,
struct
sess
*
sp
)
{
CHECK_OBJ_NOTNULL
(
w
,
WAITER_MAGIC
);
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
assert
(
sp
->
fd
>=
0
);
return
(
w
aiter
->
pass
(
waiter_
priv
,
sp
));
return
(
w
->
impl
->
pass
(
w
->
priv
,
sp
));
}
/*
...
...
bin/varnishd/waiter/waiter.h
View file @
f1da3c43
...
...
@@ -29,6 +29,7 @@
*/
struct
sess
;
struct
waiter
;
enum
wait_event
{
WAITER_REMCLOSE
,
...
...
@@ -49,8 +50,8 @@ struct waiter_impl {
};
/* cache_waiter.c */
int
WAIT_Enter
(
void
*
waiter_priv
,
struct
sess
*
sp
);
void
*
WAIT_Init
(
waiter_handle_f
*
);
int
WAIT_Enter
(
const
struct
waiter
*
,
struct
sess
*
sp
);
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