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
dc0b0ca1
Commit
dc0b0ca1
authored
Aug 27, 2015
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Hide backends and directors implementation details"
This reverts commit
d771942c
, it needs to be discussed first.
parent
34360fd1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
43 deletions
+46
-43
Makefile.am
bin/varnishd/Makefile.am
+2
-2
cache.h
bin/varnishd/cache/cache.h
+0
-41
cache_director.h
bin/varnishd/cache/cache_director.h
+43
-0
vdir.c
lib/libvmod_directors/vdir.c
+1
-0
No files found.
bin/varnishd/Makefile.am
View file @
dc0b0ca1
...
@@ -99,8 +99,6 @@ varnishd_SOURCES = \
...
@@ -99,8 +99,6 @@ varnishd_SOURCES = \
noinst_HEADERS
=
\
noinst_HEADERS
=
\
builtin_vcl.h
\
builtin_vcl.h
\
cache/cache_backend.h
\
cache/cache_director.h
\
cache/cache_esi.h
\
cache/cache_esi.h
\
cache/cache_pool.h
\
cache/cache_pool.h
\
common/heritage.h
\
common/heritage.h
\
...
@@ -118,6 +116,8 @@ noinst_HEADERS = \
...
@@ -118,6 +116,8 @@ noinst_HEADERS = \
nobase_pkginclude_HEADERS
=
\
nobase_pkginclude_HEADERS
=
\
cache/cache.h
\
cache/cache.h
\
cache/cache_filter.h
\
cache/cache_filter.h
\
cache/cache_backend.h
\
cache/cache_director.h
\
common/common.h
\
common/common.h
\
common/params.h
\
common/params.h
\
waiter/waiter.h
waiter/waiter.h
...
...
bin/varnishd/cache/cache.h
View file @
dc0b0ca1
...
@@ -189,47 +189,6 @@ struct http {
...
@@ -189,47 +189,6 @@ struct http {
uint8_t
conds
;
/* If-* headers present */
uint8_t
conds
;
/* If-* headers present */
};
};
/*--------------------------------------------------------------------
* Director public APIs
*/
typedef
unsigned
vdi_healthy_f
(
const
struct
director
*
,
const
struct
busyobj
*
,
double
*
changed
);
typedef
const
struct
director
*
vdi_resolve_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
int
vdi_gethdrs_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
int
vdi_getbody_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
const
struct
suckaddr
*
vdi_getip_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
void
vdi_finish_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
void
vdi_http1pipe_f
(
const
struct
director
*
,
struct
req
*
,
struct
busyobj
*
);
typedef
void
vdi_panic_f
(
const
struct
director
*
,
struct
vsb
*
);
struct
director
{
unsigned
magic
;
#define DIRECTOR_MAGIC 0x3336351d
const
char
*
name
;
char
*
vcl_name
;
vdi_http1pipe_f
*
http1pipe
;
vdi_healthy_f
*
healthy
;
vdi_resolve_f
*
resolve
;
vdi_gethdrs_f
*
gethdrs
;
vdi_getbody_f
*
getbody
;
vdi_getip_f
*
getip
;
vdi_finish_f
*
finish
;
vdi_panic_f
*
panic
;
void
*
priv
;
const
void
*
priv2
;
};
/*--------------------------------------------------------------------
/*--------------------------------------------------------------------
* VFP filter state
* VFP filter state
*/
*/
...
...
bin/varnishd/cache/cache_director.h
View file @
dc0b0ca1
...
@@ -37,6 +37,49 @@
...
@@ -37,6 +37,49 @@
*
*
*/
*/
/*--------------------------------------------------------------------
* A director is a piece of code which selects one of possibly multiple
* backends to use.
*/
typedef
unsigned
vdi_healthy_f
(
const
struct
director
*
,
const
struct
busyobj
*
,
double
*
changed
);
typedef
const
struct
director
*
vdi_resolve_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
int
vdi_gethdrs_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
int
vdi_getbody_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
const
struct
suckaddr
*
vdi_getip_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
void
vdi_finish_f
(
const
struct
director
*
,
struct
worker
*
,
struct
busyobj
*
);
typedef
void
vdi_http1pipe_f
(
const
struct
director
*
,
struct
req
*
,
struct
busyobj
*
);
typedef
void
vdi_panic_f
(
const
struct
director
*
,
struct
vsb
*
);
struct
director
{
unsigned
magic
;
#define DIRECTOR_MAGIC 0x3336351d
const
char
*
name
;
char
*
vcl_name
;
vdi_http1pipe_f
*
http1pipe
;
vdi_healthy_f
*
healthy
;
vdi_resolve_f
*
resolve
;
vdi_gethdrs_f
*
gethdrs
;
vdi_getbody_f
*
getbody
;
vdi_getip_f
*
getip
;
vdi_finish_f
*
finish
;
vdi_panic_f
*
panic
;
void
*
priv
;
const
void
*
priv2
;
};
/* cache_director.c */
/* cache_director.c */
int
VDI_GetHdr
(
struct
worker
*
,
struct
busyobj
*
);
int
VDI_GetHdr
(
struct
worker
*
,
struct
busyobj
*
);
...
...
lib/libvmod_directors/vdir.c
View file @
dc0b0ca1
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include <stdlib.h>
#include <stdlib.h>
#include "cache/cache.h"
#include "cache/cache.h"
#include "cache/cache_director.h"
#include "vrt.h"
#include "vrt.h"
#include "vbm.h"
#include "vbm.h"
...
...
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