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
a0e052c1
Commit
a0e052c1
authored
Jan 12, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename "struct waiter" to "struct waiter_impl", so we can repurpose
the former for an instance of a waiter.
parent
c0613e99
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
18 deletions
+18
-18
cache_waiter_epoll.c
bin/varnishd/waiter/cache_waiter_epoll.c
+1
-1
cache_waiter_kqueue.c
bin/varnishd/waiter/cache_waiter_kqueue.c
+1
-1
cache_waiter_poll.c
bin/varnishd/waiter/cache_waiter_poll.c
+1
-1
cache_waiter_ports.c
bin/varnishd/waiter/cache_waiter_ports.c
+1
-1
mgt_waiter.c
bin/varnishd/waiter/mgt_waiter.c
+8
-8
waiter.h
bin/varnishd/waiter/waiter.h
+6
-6
No files found.
bin/varnishd/waiter/cache_waiter_epoll.c
View file @
a0e052c1
...
...
@@ -259,7 +259,7 @@ vwe_init(waiter_handle_f *func)
/*--------------------------------------------------------------------*/
const
struct
waiter
waiter_epoll
=
{
const
struct
waiter
_impl
waiter_epoll
=
{
.
name
=
"epoll"
,
.
init
=
vwe_init
,
.
pass
=
vwe_pass
,
...
...
bin/varnishd/waiter/cache_waiter_kqueue.c
View file @
a0e052c1
...
...
@@ -251,7 +251,7 @@ vwk_init(waiter_handle_f *func)
/*--------------------------------------------------------------------*/
const
struct
waiter
waiter_kqueue
=
{
const
struct
waiter
_impl
waiter_kqueue
=
{
.
name
=
"kqueue"
,
.
init
=
vwk_init
,
.
pass
=
vwk_pass
,
...
...
bin/varnishd/waiter/cache_waiter_poll.c
View file @
a0e052c1
...
...
@@ -227,7 +227,7 @@ vwp_poll_init(waiter_handle_f *func)
/*--------------------------------------------------------------------*/
const
struct
waiter
waiter_poll
=
{
const
struct
waiter
_impl
waiter_poll
=
{
.
name
=
"poll"
,
.
init
=
vwp_poll_init
,
.
pass
=
vwp_poll_pass
,
...
...
bin/varnishd/waiter/cache_waiter_ports.c
View file @
a0e052c1
...
...
@@ -272,7 +272,7 @@ vws_init(waiter_handle_f *func)
/*--------------------------------------------------------------------*/
const
struct
waiter
waiter_ports
=
{
const
struct
waiter
_impl
waiter_ports
=
{
.
name
=
"ports"
,
.
init
=
vws_init
,
.
pass
=
vws_pass
...
...
bin/varnishd/waiter/mgt_waiter.c
View file @
a0e052c1
...
...
@@ -37,7 +37,7 @@
#include "waiter/waiter.h"
static
const
struct
waiter
*
const
vca_waiter
s
[]
=
{
static
const
struct
waiter
_impl
*
const
waiter_impl
s
[]
=
{
#if defined(HAVE_KQUEUE)
&
waiter_kqueue
,
#endif
...
...
@@ -51,7 +51,7 @@ static const struct waiter *const vca_waiters[] = {
NULL
,
};
struct
waiter
const
*
waiter
;
struct
waiter
_impl
const
*
waiter
;
int
WAIT_tweak_waiter
(
struct
vsb
*
vsb
,
const
char
*
arg
)
...
...
@@ -67,19 +67,19 @@ WAIT_tweak_waiter(struct vsb *vsb, const char *arg)
VSB_printf
(
vsb
,
"%s"
,
waiter
->
name
);
VSB_printf
(
vsb
,
" (possible values: "
);
for
(
i
=
0
;
vca_waiter
s
[
i
]
!=
NULL
;
i
++
)
for
(
i
=
0
;
waiter_impl
s
[
i
]
!=
NULL
;
i
++
)
VSB_printf
(
vsb
,
"%s%s"
,
i
==
0
?
""
:
", "
,
vca_waiter
s
[
i
]
->
name
);
waiter_impl
s
[
i
]
->
name
);
VSB_printf
(
vsb
,
")"
);
return
(
0
);
}
if
(
!
strcmp
(
arg
,
WAITER_DEFAULT
))
{
waiter
=
vca_waiter
s
[
0
];
waiter
=
waiter_impl
s
[
0
];
return
(
0
);
}
for
(
i
=
0
;
vca_waiter
s
[
i
];
i
++
)
{
if
(
!
strcmp
(
arg
,
vca_waiter
s
[
i
]
->
name
))
{
waiter
=
vca_waiter
s
[
i
];
for
(
i
=
0
;
waiter_impl
s
[
i
];
i
++
)
{
if
(
!
strcmp
(
arg
,
waiter_impl
s
[
i
]
->
name
))
{
waiter
=
waiter_impl
s
[
i
];
return
(
0
);
}
}
...
...
bin/varnishd/waiter/waiter.h
View file @
a0e052c1
...
...
@@ -42,7 +42,7 @@ typedef int waiter_pass_f(void *priv, struct sess *);
#define WAITER_DEFAULT "platform dependent"
struct
waiter
{
struct
waiter
_impl
{
const
char
*
name
;
waiter_init_f
*
init
;
waiter_pass_f
*
pass
;
...
...
@@ -55,19 +55,19 @@ const char *WAIT_GetName(void);
int
WAIT_Write_Session
(
struct
sess
*
sp
,
int
fd
);
/* mgt_waiter.c */
extern
struct
waiter
const
*
waiter
;
extern
struct
waiter
_impl
const
*
waiter
;
int
WAIT_tweak_waiter
(
struct
vsb
*
vsb
,
const
char
*
arg
);
#if defined(HAVE_EPOLL_CTL)
extern
const
struct
waiter
waiter_epoll
;
extern
const
struct
waiter
_impl
waiter_epoll
;
#endif
#if defined(HAVE_KQUEUE)
extern
const
struct
waiter
waiter_kqueue
;
extern
const
struct
waiter
_impl
waiter_kqueue
;
#endif
#if defined(HAVE_PORT_CREATE)
extern
const
struct
waiter
waiter_ports
;
extern
const
struct
waiter
_impl
waiter_ports
;
#endif
extern
const
struct
waiter
waiter_poll
;
extern
const
struct
waiter
_impl
waiter_poll
;
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