Skip to content

V
varnishevent3
Commit 9192fc96 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Namespace cleanup: CLS_ -> VCLS_

parent e1d2d67c
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
bin/varnishd/cache_cli.c
View file @ 9192fc96
...@@ -75,7 +75,7 @@ CLI_AddFuncs(struct cli_proto *p) ...@@ -75,7 +75,7 @@ CLI_AddFuncs(struct cli_proto *p)
AZ(add_check); AZ(add_check);
Lck_Lock(&cli_mtx); Lck_Lock(&cli_mtx);
AZ(CLS_AddFunc(cls, 0, p)); AZ(VCLS_AddFunc(cls, 0, p));
Lck_Unlock(&cli_mtx); Lck_Unlock(&cli_mtx);
} }
...@@ -107,10 +107,10 @@ CLI_Run(void) ...@@ -107,10 +107,10 @@ CLI_Run(void)
add_check = 1; add_check = 1;
AN(CLS_AddFd(cls, heritage.cli_in, heritage.cli_out, NULL, NULL)); AN(VCLS_AddFd(cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
do { do {
i = CLS_Poll(cls, -1); i = VCLS_Poll(cls, -1);
} while(i > 0); } while(i > 0);
VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops"); VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops");
VCA_Shutdown(); VCA_Shutdown();
...@@ -157,8 +157,8 @@ ccf_panic(struct cli *cli, const char * const *av, void *priv) ...@@ -157,8 +157,8 @@ ccf_panic(struct cli *cli, const char * const *av, void *priv)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static struct cli_proto master_cmds[] = { static struct cli_proto master_cmds[] = {
{ CLI_PING, "i", CLS_func_ping }, { CLI_PING, "i", VCLS_func_ping },
{ CLI_HELP, "i", CLS_func_help }, { CLI_HELP, "i", VCLS_func_help },
{ "debug.sizeof", "debug.sizeof", { "debug.sizeof", "debug.sizeof",
"\tDump sizeof various data structures\n", "\tDump sizeof various data structures\n",
0, 0, "d", cli_debug_sizeof }, 0, 0, "d", cli_debug_sizeof },
...@@ -179,7 +179,7 @@ CLI_Init(void) ...@@ -179,7 +179,7 @@ CLI_Init(void)
Lck_New(&cli_mtx, lck_cli); Lck_New(&cli_mtx, lck_cli);
cli_thread = pthread_self(); cli_thread = pthread_self();
cls = CLS_New(cli_cb_before, cli_cb_after, params->cli_buffer); cls = VCLS_New(cli_cb_before, cli_cb_after, params->cli_buffer);
AN(cls); AN(cls);
CLI_AddFuncs(master_cmds); CLI_AddFuncs(master_cmds);
......
bin/varnishd/cache_vcl.c
View file @ 9192fc96
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
struct vcls { struct vcls {
unsigned magic; unsigned magic;
#define VCLS_MAGIC 0x214188f2 #define VVCLS_MAGIC 0x214188f2
VTAILQ_ENTRY(vcls) list; VTAILQ_ENTRY(vcls) list;
char *name; char *name;
void *dlh; void *dlh;
...@@ -145,7 +145,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli) ...@@ -145,7 +145,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
return (1); return (1);
} }
ALLOC_OBJ(vcl, VCLS_MAGIC); ALLOC_OBJ(vcl, VVCLS_MAGIC);
XXXAN(vcl); XXXAN(vcl);
vcl->dlh = dlopen(fn, RTLD_NOW | RTLD_LOCAL); vcl->dlh = dlopen(fn, RTLD_NOW | RTLD_LOCAL);
......
bin/varnishd/mgt_cli.c
View file @ 9192fc96
...@@ -305,10 +305,10 @@ mcf_auth(struct cli *cli, const char *const *av, void *priv) ...@@ -305,10 +305,10 @@ mcf_auth(struct cli *cli, const char *const *av, void *priv)
} }
static struct cli_proto cli_auth[] = { static struct cli_proto cli_auth[] = {
{ CLI_HELP, "", CLS_func_help, NULL }, { CLI_HELP, "", VCLS_func_help, NULL },
{ CLI_PING, "", CLS_func_ping }, { CLI_PING, "", VCLS_func_ping },
{ CLI_AUTH, "", mcf_auth, NULL }, { CLI_AUTH, "", mcf_auth, NULL },
{ CLI_QUIT, "", CLS_func_close, NULL}, { CLI_QUIT, "", VCLS_func_close, NULL},
{ NULL } { NULL }
}; };
...@@ -336,13 +336,13 @@ static void ...@@ -336,13 +336,13 @@ static void
mgt_cli_init_cls(void) mgt_cli_init_cls(void)
{ {
cls = CLS_New(mgt_cli_cb_before, mgt_cli_cb_after, params->cli_buffer); cls = VCLS_New(mgt_cli_cb_before, mgt_cli_cb_after, params->cli_buffer);
AN(cls); AN(cls);
AZ(CLS_AddFunc(cls, MCF_NOAUTH, cli_auth)); AZ(VCLS_AddFunc(cls, MCF_NOAUTH, cli_auth));
AZ(CLS_AddFunc(cls, MCF_AUTH, cli_proto)); AZ(VCLS_AddFunc(cls, MCF_AUTH, cli_proto));
AZ(CLS_AddFunc(cls, MCF_AUTH, cli_debug)); AZ(VCLS_AddFunc(cls, MCF_AUTH, cli_debug));
AZ(CLS_AddFunc(cls, MCF_AUTH, cli_stv)); AZ(VCLS_AddFunc(cls, MCF_AUTH, cli_stv));
AZ(CLS_AddFunc(cls, MCF_AUTH, cli_askchild)); AZ(VCLS_AddFunc(cls, MCF_AUTH, cli_askchild));
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
...@@ -353,7 +353,7 @@ void ...@@ -353,7 +353,7 @@ void
mgt_cli_close_all(void) mgt_cli_close_all(void)
{ {
CLS_Destroy(&cls); VCLS_Destroy(&cls);
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
...@@ -367,7 +367,7 @@ mgt_cli_callback2(const struct vev *e, int what) ...@@ -367,7 +367,7 @@ mgt_cli_callback2(const struct vev *e, int what)
(void)e; (void)e;
(void)what; (void)what;
i = CLS_PollFd(cls, e->fd, 0); i = VCLS_PollFd(cls, e->fd, 0);
return (i); return (i);
} }
...@@ -384,7 +384,7 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f ...@@ -384,7 +384,7 @@ mgt_cli_setup(int fdi, int fdo, int verbose, const char *ident, mgt_cli_close_f
if (cls == NULL) if (cls == NULL)
mgt_cli_init_cls(); mgt_cli_init_cls();
cli = CLS_AddFd(cls, fdi, fdo, closefunc, priv); cli = VCLS_AddFd(cls, fdi, fdo, closefunc, priv);
cli->ident = strdup(ident); cli->ident = strdup(ident);
......
include/cli_serve.h
View file @ 9192fc96
...@@ -30,16 +30,16 @@ ...@@ -30,16 +30,16 @@
struct cls; struct cls;
typedef void cls_cb_f(void *priv); typedef void cls_cb_f(void *priv);
typedef void cls_cbc_f(const struct cli*); typedef void cls_cbc_f(const struct cli*);
struct cls *CLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen); struct cls *VCLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen);
struct cli *CLS_AddFd(struct cls *cs, int fdi, int fdo, cls_cb_f *closefunc, struct cli *VCLS_AddFd(struct cls *cs, int fdi, int fdo, cls_cb_f *closefunc,
void *priv); void *priv);
int CLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp); int VCLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp);
int CLS_Poll(struct cls *cs, int timeout); int VCLS_Poll(struct cls *cs, int timeout);
int CLS_PollFd(struct cls *cs, int fd, int timeout); int VCLS_PollFd(struct cls *cs, int fd, int timeout);
void CLS_Destroy(struct cls **); void VCLS_Destroy(struct cls **);
/* From libvarnish/cli.c */ /* From libvarnish/cli.c */
cli_func_t CLS_func_close; cli_func_t VCLS_func_close;
cli_func_t CLS_func_help; cli_func_t VCLS_func_help;
cli_func_t CLS_func_ping; cli_func_t VCLS_func_ping;
lib/libvarnish/cli_serve.c
View file @ 9192fc96
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
struct cls_func { struct cls_func {
unsigned magic; unsigned magic;
#define CLS_FUNC_MAGIC 0x7d280c9b #define VCLS_FUNC_MAGIC 0x7d280c9b
VTAILQ_ENTRY(cls_func) list; VTAILQ_ENTRY(cls_func) list;
unsigned auth; unsigned auth;
struct cli_proto *clp; struct cli_proto *clp;
...@@ -58,7 +58,7 @@ struct cls_func { ...@@ -58,7 +58,7 @@ struct cls_func {
struct cls_fd { struct cls_fd {
unsigned magic; unsigned magic;
#define CLS_FD_MAGIC 0x010dbd1e #define VCLS_FD_MAGIC 0x010dbd1e
VTAILQ_ENTRY(cls_fd) list; VTAILQ_ENTRY(cls_fd) list;
int fdi, fdo; int fdi, fdo;
struct cls *cls; struct cls *cls;
...@@ -72,7 +72,7 @@ struct cls_fd { ...@@ -72,7 +72,7 @@ struct cls_fd {
struct cls { struct cls {
unsigned magic; unsigned magic;
#define CLS_MAGIC 0x60f044a3 #define VCLS_MAGIC 0x60f044a3
VTAILQ_HEAD(,cls_fd) fds; VTAILQ_HEAD(,cls_fd) fds;
unsigned nfd; unsigned nfd;
VTAILQ_HEAD(,cls_func) funcs; VTAILQ_HEAD(,cls_func) funcs;
...@@ -83,7 +83,7 @@ struct cls { ...@@ -83,7 +83,7 @@ struct cls {
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
void void
CLS_func_close(struct cli *cli, const char *const *av, void *priv) VCLS_func_close(struct cli *cli, const char *const *av, void *priv)
{ {
(void)av; (void)av;
...@@ -95,7 +95,7 @@ CLS_func_close(struct cli *cli, const char *const *av, void *priv) ...@@ -95,7 +95,7 @@ CLS_func_close(struct cli *cli, const char *const *av, void *priv)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
void void
CLS_func_ping(struct cli *cli, const char * const *av, void *priv) VCLS_func_ping(struct cli *cli, const char * const *av, void *priv)
{ {
time_t t; time_t t;
...@@ -108,7 +108,7 @@ CLS_func_ping(struct cli *cli, const char * const *av, void *priv) ...@@ -108,7 +108,7 @@ CLS_func_ping(struct cli *cli, const char * const *av, void *priv)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
void void
CLS_func_help(struct cli *cli, const char * const *av, void *priv) VCLS_func_help(struct cli *cli, const char * const *av, void *priv)
{ {
struct cli_proto *cp; struct cli_proto *cp;
struct cls_func *cfn; struct cls_func *cfn;
...@@ -117,7 +117,7 @@ CLS_func_help(struct cli *cli, const char * const *av, void *priv) ...@@ -117,7 +117,7 @@ CLS_func_help(struct cli *cli, const char * const *av, void *priv)
(void)priv; (void)priv;
cs = cli->cls; cs = cli->cls;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
if (av[2] == NULL) { if (av[2] == NULL) {
all = debug = 0; all = debug = 0;
...@@ -242,9 +242,9 @@ cls_vlu2(void *priv, char * const *av) ...@@ -242,9 +242,9 @@ cls_vlu2(void *priv, char * const *av)
struct cli *cli; struct cli *cli;
unsigned na; unsigned na;
CAST_OBJ_NOTNULL(cfd, priv, CLS_FD_MAGIC); CAST_OBJ_NOTNULL(cfd, priv, VCLS_FD_MAGIC);
cs = cfd->cls; cs = cfd->cls;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
cli = cfd->cli; cli = cfd->cli;
CHECK_OBJ_NOTNULL(cli, CLI_MAGIC); CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
...@@ -307,7 +307,7 @@ cls_vlu(void *priv, const char *p) ...@@ -307,7 +307,7 @@ cls_vlu(void *priv, const char *p)
int i; int i;
char **av; char **av;
CAST_OBJ_NOTNULL(cfd, priv, CLS_FD_MAGIC); CAST_OBJ_NOTNULL(cfd, priv, VCLS_FD_MAGIC);
cli = cfd->cli; cli = cfd->cli;
CHECK_OBJ_NOTNULL(cli, CLI_MAGIC); CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
...@@ -375,11 +375,11 @@ cls_vlu(void *priv, const char *p) ...@@ -375,11 +375,11 @@ cls_vlu(void *priv, const char *p)
} }
struct cls * struct cls *
CLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen) VCLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen)
{ {
struct cls *cs; struct cls *cs;
ALLOC_OBJ(cs, CLS_MAGIC); ALLOC_OBJ(cs, VCLS_MAGIC);
AN(cs); AN(cs);
VTAILQ_INIT(&cs->fds); VTAILQ_INIT(&cs->fds);
VTAILQ_INIT(&cs->funcs); VTAILQ_INIT(&cs->funcs);
...@@ -390,14 +390,14 @@ CLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen) ...@@ -390,14 +390,14 @@ CLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen)
} }
struct cli * struct cli *
CLS_AddFd(struct cls *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv) VCLS_AddFd(struct cls *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
{ {
struct cls_fd *cfd; struct cls_fd *cfd;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
assert(fdi >= 0); assert(fdi >= 0);
assert(fdo >= 0); assert(fdo >= 0);
ALLOC_OBJ(cfd, CLS_FD_MAGIC); ALLOC_OBJ(cfd, VCLS_FD_MAGIC);
AN(cfd); AN(cfd);
cfd->cls = cs; cfd->cls = cs;
cfd->fdi = fdi; cfd->fdi = fdi;
...@@ -418,8 +418,8 @@ static void ...@@ -418,8 +418,8 @@ static void
cls_close_fd(struct cls *cs, struct cls_fd *cfd) cls_close_fd(struct cls *cs, struct cls_fd *cfd)
{ {
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
CHECK_OBJ_NOTNULL(cfd, CLS_FD_MAGIC); CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
VTAILQ_REMOVE(&cs->fds, cfd, list); VTAILQ_REMOVE(&cs->fds, cfd, list);
cs->nfd--; cs->nfd--;
...@@ -439,12 +439,12 @@ cls_close_fd(struct cls *cs, struct cls_fd *cfd) ...@@ -439,12 +439,12 @@ cls_close_fd(struct cls *cs, struct cls_fd *cfd)
int int
CLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp) VCLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp)
{ {
struct cls_func *cfn; struct cls_func *cfn;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
ALLOC_OBJ(cfn, CLS_FUNC_MAGIC); ALLOC_OBJ(cfn, VCLS_FUNC_MAGIC);
AN(cfn); AN(cfn);
cfn->clp = clp; cfn->clp = clp;
cfn->auth = auth; cfn->auth = auth;
...@@ -453,13 +453,13 @@ CLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp) ...@@ -453,13 +453,13 @@ CLS_AddFunc(struct cls *cs, unsigned auth, struct cli_proto *clp)
} }
int int
CLS_PollFd(struct cls *cs, int fd, int timeout) VCLS_PollFd(struct cls *cs, int fd, int timeout)
{ {
struct cls_fd *cfd; struct cls_fd *cfd;
struct pollfd pfd[1]; struct pollfd pfd[1];
int i, j, k; int i, j, k;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
if (cs->nfd == 0) { if (cs->nfd == 0) {
errno = 0; errno = 0;
return (-1); return (-1);
...@@ -477,7 +477,7 @@ CLS_PollFd(struct cls *cs, int fd, int timeout) ...@@ -477,7 +477,7 @@ CLS_PollFd(struct cls *cs, int fd, int timeout)
break; break;
} }
assert(i == 1); assert(i == 1);
CHECK_OBJ_NOTNULL(cfd, CLS_FD_MAGIC); CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
j = poll(pfd, 1, timeout); j = poll(pfd, 1, timeout);
if (j <= 0) if (j <= 0)
...@@ -492,12 +492,12 @@ CLS_PollFd(struct cls *cs, int fd, int timeout) ...@@ -492,12 +492,12 @@ CLS_PollFd(struct cls *cs, int fd, int timeout)
} }
int int
CLS_Poll(struct cls *cs, int timeout) VCLS_Poll(struct cls *cs, int timeout)
{ {
struct cls_fd *cfd, *cfd2; struct cls_fd *cfd, *cfd2;
int i, j, k; int i, j, k;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
if (cs->nfd == 0) { if (cs->nfd == 0) {
errno = 0; errno = 0;
return (-1); return (-1);
...@@ -535,7 +535,7 @@ CLS_Poll(struct cls *cs, int timeout) ...@@ -535,7 +535,7 @@ CLS_Poll(struct cls *cs, int timeout)
} }
void void
CLS_Destroy(struct cls **csp) VCLS_Destroy(struct cls **csp)
{ {
struct cls *cs; struct cls *cs;
struct cls_fd *cfd, *cfd2; struct cls_fd *cfd, *cfd2;
...@@ -543,7 +543,7 @@ CLS_Destroy(struct cls **csp) ...@@ -543,7 +543,7 @@ CLS_Destroy(struct cls **csp)
cs = *csp; cs = *csp;
*csp = NULL; *csp = NULL;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC); CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2) VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2)
cls_close_fd(cs, cfd); cls_close_fd(cs, cfd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment