Get rid of VCL_FARGS and VCL_PASS_ARGS macros.

Generate VGC prefixes instead of VCL.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@208 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 95340f1c06fb25a60b946c0d0bf2181aa5055162..ef68cdae456d9b1db1d544dab2593e65466f50dc 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -24,7 +24,7 @@
 /*--------------------------------------------------------------------*/
 
 void
-VRT_error(VCL_FARGS, unsigned err, const char *str)
+VRT_error(struct sess *sp, unsigned err, const char *str)
 { 
 
        VSL(SLT_Debug, 0, "VCL_error(%u, %s)", err, str);
@@ -44,13 +44,13 @@ VRT_count(struct sess *sp, unsigned u)
 /*--------------------------------------------------------------------*/
 
 char *
-VRT_GetHdr(VCL_FARGS, const char *n)
+VRT_GetHdr(struct sess *sp, const char *n)
 {
        char *p;
 
-       assert(sess != NULL);
-       assert(sess->http != NULL);
-       if (!http_GetHdr(sess->http, n, &p))
+       assert(sp != NULL);
+       assert(sp->http != NULL);
+       if (!http_GetHdr(sp->http, n, &p))
                return (NULL);
        return (p);
 }
@@ -58,12 +58,12 @@ VRT_GetHdr(VCL_FARGS, const char *n)
 /*--------------------------------------------------------------------*/
 
 char *
-VRT_GetReq(VCL_FARGS)
+VRT_GetReq(struct sess *sp)
 {
        char *p;
 
-       assert(sess != NULL);
-       assert(sess->http != NULL);
-       assert(http_GetReq(sess->http, &p));
+       assert(sp != NULL);
+       assert(sp->http != NULL);
+       assert(http_GetReq(sp->http, &p));
        return (p);
 }

diff --git a/varnish-cache/include/vcl_lang.h b/varnish-cache/include/vcl_lang.h
index b2790c630d06a0e2d89cb64b72b55bffe273a9bd..20fc6a726a681e1d6ee6ce2be7d250ceb08f9e0e 100644 (file)
--- a/varnish-cache/include/vcl_lang.h
+++ b/varnish-cache/include/vcl_lang.h
@@ -76,16 +76,13 @@ struct backend {
        struct vbe      *vbe;
 };
 
-#define VCL_FARGS      struct sess *sess
-#define VCL_PASS_ARGS  sess
-
 #if 0
 int ip_match(unsigned, struct vcl_acl *);
 int string_match(const char *, const char *);
 #endif
 
 typedef void vcl_init_f(void);
-typedef void vcl_func_f(VCL_FARGS);
+typedef void vcl_func_f(struct sess *sp);
 
 struct VCL_conf {
        unsigned        magic;

diff --git a/varnish-cache/include/vrt.h b/varnish-cache/include/vrt.h
index 8b97814842e15371f58416201c5192003b5a394e..936f46beb8fca996dd8d335ffa01b752f78954e7 100644 (file)
--- a/varnish-cache/include/vrt.h
+++ b/varnish-cache/include/vrt.h
@@ -19,18 +19,18 @@ struct vrt_acl {
 };
 
 void VRT_count(struct sess *, unsigned);
-void VRT_no_cache(VCL_FARGS);
-void VRT_no_new_cache(VCL_FARGS);
+void VRT_no_cache(struct sess *);
+void VRT_no_new_cache(struct sess *);
 #if 0
 int ip_match(unsigned, struct vcl_acl *);
 int string_match(const char *, const char *);
 #endif
 int VRT_rewrite(const char *, const char *);
-void VRT_error(VCL_FARGS, unsigned, const char *);
+void VRT_error(struct sess *, unsigned, const char *);
 int VRT_switch_config(const char *);
 
-char *VRT_GetHdr(VCL_FARGS, const char *);
-char *VRT_GetReq(VCL_FARGS);
+char *VRT_GetHdr(struct sess *, const char *);
+char *VRT_GetReq(struct sess *);
 
 #define VRT_done(sess, hand)                   \
        do {                                    \

diff --git a/varnish-cache/lib/libvcl/vcl_compile.c b/varnish-cache/lib/libvcl/vcl_compile.c
index d5f17aa0157a34dfbe859c6bd26db4795bb47fb7..99313cb86ae7fd12f323138824f22a407ff09ae8 100644 (file)
--- a/varnish-cache/lib/libvcl/vcl_compile.c
+++ b/varnish-cache/lib/libvcl/vcl_compile.c
@@ -122,9 +122,9 @@ static struct var be_vars[] = {
 
 
 static struct var vars[] = {
-       { "req.request",                STRING,   0,  "VRT_GetReq(VCL_PASS_ARGS)"            },
-       { "obj.valid",                  BOOL,     0,  "sess->obj->valid"     },
-       { "obj.cacheable",              BOOL,     0,  "sess->obj->cacheable" },
+       { "req.request",                STRING,   0,  "VRT_GetReq(sp)"       },
+       { "obj.valid",                  BOOL,     0,  "sp->obj->valid"     },
+       { "obj.cacheable",              BOOL,     0,  "sp->obj->cacheable" },
        { "req.http.",                  HEADER,   0,  NULL },
 #if 0
        { "req.ttlfactor",              FLOAT, 0,   "req->ttlfactor" },
@@ -272,7 +272,7 @@ _Expect(struct tokenlist *tl, unsigned tok, int line)
 
 #define C(tl, sep)     do {                            \
        I(tl);                                          \
-       sbuf_printf(tl->fc, "VRT_count(sess, %u)%s\n", ++tl->cnt, sep); \
+       sbuf_printf(tl->fc, "VRT_count(sp, %u)%s\n", ++tl->cnt, sep);   \
        tl->t->cnt = tl->cnt;                           \
 } while (0)
        
@@ -567,7 +567,7 @@ HeaderVar(struct tokenlist *tl, struct token *t, struct var *vh)
        p[i] = '\0';
        v->name = p;
        v->fmt = STRING;
-       asprintf(&p, "VRT_GetHdr(VCL_PASS_ARGS, \"%s\")", v->name + vh->len);
+       asprintf(&p, "VRT_GetHdr(sp, \"%s\")", v->name + vh->len);
        assert(p != NULL);
        v->cname = p;
        return (v);
@@ -914,26 +914,26 @@ Action(struct tokenlist *tl)
        switch (at->tok) {
        case T_NO_NEW_CACHE:
                I(tl);
-               sbuf_printf(tl->fc, "VCL_no_new_cache(VCL_PASS_ARGS);\n");
+               sbuf_printf(tl->fc, "VCL_no_new_cache(sp);\n");
                return;
        case T_NO_CACHE:
                I(tl);
-               sbuf_printf(tl->fc, "VCL_no_cache(VCL_PASS_ARGS);\n");
+               sbuf_printf(tl->fc, "VCL_no_cache(sp);\n");
                return;
        case T_DELIVER:
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Deliver);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Deliver);\n");
                return;
        case T_LOOKUP:
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Lookup);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Lookup);\n");
                return;
        case T_PASS:
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Pass);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Pass);\n");
                return;
        case T_FETCH:
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Fetch);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Fetch);\n");
                return;
        case T_INSERT:
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Insert);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Insert);\n");
                return;
        case T_ERROR:
                if (tl->t->tok == CNUM)
@@ -941,7 +941,7 @@ Action(struct tokenlist *tl)
                else
                        a = 0;
                I(tl);
-               sbuf_printf(tl->fc, "VRT_error(VCL_PASS_ARGS, %u, ", a);
+               sbuf_printf(tl->fc, "VRT_error(sp, %u, ", a);
                if (tl->t->tok == CSTR) {
                        sbuf_printf(tl->fc, "%*.*s);\n",
                            tl->t->e - tl->t->b,
@@ -949,7 +949,7 @@ Action(struct tokenlist *tl)
                        NextToken(tl);
                } else
                        sbuf_printf(tl->fc, "(const char *)0);\n");
-               I(tl); sbuf_printf(tl->fc, "VRT_done(sess, HND_Error);\n");
+               I(tl); sbuf_printf(tl->fc, "VRT_done(sp, HND_Error);\n");
                return;
        case T_SWITCH_CONFIG:
                ExpectErr(tl, ID);
@@ -963,10 +963,10 @@ Action(struct tokenlist *tl)
                ExpectErr(tl, ID);
                AddRef(tl, tl->t, R_FUNC);
                I(tl);
-               sbuf_printf(tl->fc, "VCL_function_%*.*s(VCL_PASS_ARGS);\n",
+               sbuf_printf(tl->fc, "VGC_function_%*.*s(sp);\n",
                    tl->t->e - tl->t->b,
                    tl->t->e - tl->t->b, tl->t->b);
-               I(tl); sbuf_printf(tl->fc, "if (sess->done)\n");
+               I(tl); sbuf_printf(tl->fc, "if (sp->done)\n");
                I(tl); sbuf_printf(tl->fc, "\treturn;\n");
                NextToken(tl);
                return;
@@ -1035,7 +1035,7 @@ Action(struct tokenlist *tl)
                case BACKEND:
                        if (tl->t->tok == '=') {
                                NextToken(tl);
-                               sbuf_printf(tl->fc, "= &VCL_backend_%*.*s;\n",
+                               sbuf_printf(tl->fc, "= &VGC_backend_%*.*s;\n",
                                    tl->t->e - tl->t->b,
                                    tl->t->e - tl->t->b, tl->t->b);
                                NextToken(tl);
@@ -1187,16 +1187,16 @@ Backend(struct tokenlist *tl)
        t_be = tl->t;
        AddDef(tl, tl->t, R_BACKEND);
        I(tl);
-       sbuf_printf(tl->fh, "static struct backend VCL_backend_%*.*s;\n",
+       sbuf_printf(tl->fh, "static struct backend VGC_backend_%*.*s;\n",
            tl->t->e - tl->t->b,
            tl->t->e - tl->t->b, tl->t->b);
-       sbuf_printf(tl->fc, "static struct backend VCL_backend_%*.*s;\n",
+       sbuf_printf(tl->fc, "static struct backend VGC_backend_%*.*s;\n",
            tl->t->e - tl->t->b,
            tl->t->e - tl->t->b, tl->t->b);
        sbuf_printf(tl->fc, "static void\n");
        I(tl);
        sbuf_printf(tl->fc,
-           "VCL_init_backend_%*.*s (struct backend *backend)\n",
+           "VGC_init_backend_%*.*s (struct backend *backend)\n",
            tl->t->e - tl->t->b,
            tl->t->e - tl->t->b, tl->t->b);
        I(tl);
@@ -1291,13 +1291,13 @@ Function(struct tokenlist *tl)
        NextToken(tl);
        ExpectErr(tl, ID);
        AddDef(tl, tl->t, R_FUNC);
-       sbuf_printf(tl->fh, "static void VCL_function_%*.*s (VCL_FARGS);\n",
+       sbuf_printf(tl->fh, "static void VGC_function_%*.*s (struct sess *sp);\n",
            tl->t->e - tl->t->b,
            tl->t->e - tl->t->b, tl->t->b);
        I(tl);
        sbuf_printf(tl->fc, "static void\n");
        I(tl);
-       sbuf_printf(tl->fc, "VCL_function_%*.*s (VCL_FARGS)\n",
+       sbuf_printf(tl->fc, "VGC_function_%*.*s (struct sess *sp)\n",
            tl->t->e - tl->t->b,
            tl->t->e - tl->t->b, tl->t->b);
        NextToken(tl);
@@ -1550,7 +1550,7 @@ EmitInitFunc(struct tokenlist *tl)
 
        sbuf_printf(tl->fc,
            "\nstatic void\n"
-           "VCL_Init(void)\n"
+           "VGC_Init(void)\n"
            "{\n\n");
        
        TAILQ_FOREACH(r, &tl->refs, list) {
@@ -1561,7 +1561,7 @@ EmitInitFunc(struct tokenlist *tl)
                        break;
                case R_BACKEND:
                        sbuf_printf(tl->fc,
-                           "\tVCL_init_backend_%*.*s(&VCL_backend_%*.*s);\n",
+                           "\tVGC_init_backend_%*.*s(&VGC_backend_%*.*s);\n",
                            r->name->e - r->name->b,
                            r->name->e - r->name->b, r->name->b,
                            r->name->e - r->name->b,
@@ -1582,13 +1582,13 @@ EmitStruct(struct tokenlist *tl)
        sbuf_printf(tl->fc,
            "\t.magic = VCL_CONF_MAGIC,\n");
        sbuf_printf(tl->fc,
-           "\t.init_func = VCL_Init,\n");
-       sbuf_printf(tl->fc, "\t.recv_func = VCL_function_vcl_recv,\n");
-       sbuf_printf(tl->fc, "\t.hit_func = VCL_function_vcl_hit,\n");
-       sbuf_printf(tl->fc, "\t.miss_func = VCL_function_vcl_miss,\n");
-       sbuf_printf(tl->fc, "\t.fetch_func = VCL_function_vcl_fetch,\n");
+           "\t.init_func = VGC_Init,\n");
+       sbuf_printf(tl->fc, "\t.recv_func = VGC_function_vcl_recv,\n");
+       sbuf_printf(tl->fc, "\t.hit_func = VGC_function_vcl_hit,\n");
+       sbuf_printf(tl->fc, "\t.miss_func = VGC_function_vcl_miss,\n");
+       sbuf_printf(tl->fc, "\t.fetch_func = VGC_function_vcl_fetch,\n");
        sbuf_printf(tl->fc,
-           "\t.default_backend = &VCL_backend_default,\n");
+           "\t.default_backend = &VGC_backend_default,\n");
        sbuf_printf(tl->fc,
            "\t.ref = VGC_ref,\n");
        sbuf_printf(tl->fc,

diff --git a/varnish-cache/lib/libvcl/vcl_fixed_token.c b/varnish-cache/lib/libvcl/vcl_fixed_token.c
index fdb2e57c2d5130125cdaad2d53e528448e404221..013d3800a479a6a03330ac9ec8d06e2c04891d57 100644 (file)
--- a/varnish-cache/lib/libvcl/vcl_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcl_fixed_token.c
@@ -475,16 +475,13 @@ vcl_output_lang_h(FILE *f)
        fputs(" struct vbe      *vbe;\n", f);
        fputs("};\n", f);
        fputs("\n", f);
-       fputs("#define VCL_FARGS        struct sess *sess\n", f);
-       fputs("#define VCL_PASS_ARGS    sess\n", f);
-       fputs("\n", f);
        fputs("#if 0\n", f);
        fputs("int ip_match(unsigned, struct vcl_acl *);\n", f);
        fputs("int string_match(const char *, const char *);\n", f);
        fputs("#endif\n", f);
        fputs("\n", f);
        fputs("typedef void vcl_init_f(void);\n", f);
-       fputs("typedef void vcl_func_f(VCL_FARGS);\n", f);
+       fputs("typedef void vcl_func_f(struct sess *sp);\n", f);
        fputs("\n", f);
        fputs("struct VCL_conf {\n", f);
        fputs(" unsigned        magic;\n", f);
@@ -520,18 +517,18 @@ vcl_output_lang_h(FILE *f)
        fputs("};\n", f);
        fputs("\n", f);
        fputs("void VRT_count(struct sess *, unsigned);\n", f);
-       fputs("void VRT_no_cache(VCL_FARGS);\n", f);
-       fputs("void VRT_no_new_cache(VCL_FARGS);\n", f);
+       fputs("void VRT_no_cache(struct sess *);\n", f);
+       fputs("void VRT_no_new_cache(struct sess *);\n", f);
        fputs("#if 0\n", f);
        fputs("int ip_match(unsigned, struct vcl_acl *);\n", f);
        fputs("int string_match(const char *, const char *);\n", f);
        fputs("#endif\n", f);
        fputs("int VRT_rewrite(const char *, const char *);\n", f);
-       fputs("void VRT_error(VCL_FARGS, unsigned, const char *);\n", f);
+       fputs("void VRT_error(struct sess *, unsigned, const char *);\n", f);
        fputs("int VRT_switch_config(const char *);\n", f);
        fputs("\n", f);
-       fputs("char *VRT_GetHdr(VCL_FARGS, const char *);\n", f);
-       fputs("char *VRT_GetReq(VCL_FARGS);\n", f);
+       fputs("char *VRT_GetHdr(struct sess *, const char *);\n", f);
+       fputs("char *VRT_GetReq(struct sess *);\n", f);
        fputs("\n", f);
        fputs("#define VRT_done(sess, hand)                     \\\n", f);
        fputs(" do {                                    \\\n", f);