Add req.restarts variable.

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

diff --git a/varnish-cache/include/vrt_obj.h b/varnish-cache/include/vrt_obj.h
index ec7065d86a2351686ae237cf894a0dbad69c0b23..f8a9cd4a1855aa58b0a6422273936bb1bd8e8153 100644 (file)
--- a/varnish-cache/include/vrt_obj.h
+++ b/varnish-cache/include/vrt_obj.h
@@ -21,6 +21,7 @@ void VRT_l_req_proto(const struct sess *, const char *, ...);
 void VRT_l_req_hash(struct sess *, const char *);
 struct backend * VRT_r_req_backend(struct sess *);
 void VRT_l_req_backend(struct sess *, struct backend *);
+int VRT_r_req_restarts(const struct sess *);
 const char * VRT_r_bereq_request(const struct sess *);
 void VRT_l_bereq_request(const struct sess *, const char *, ...);
 const char * VRT_r_bereq_url(const struct sess *);

diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index 3885cabc10869a9884ab1f006588cdaac2df615a..0c92723a58e5692062d554b94321ce5617a1107c 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -530,6 +530,7 @@ vcl_output_lang_h(struct vsb *sb)
        vsb_cat(sb, "void VRT_l_req_hash(struct sess *, const char *);\n");
        vsb_cat(sb, "struct backend * VRT_r_req_backend(struct sess *);\n");
        vsb_cat(sb, "void VRT_l_req_backend(struct sess *, struct backend *);\n");
+       vsb_cat(sb, "int VRT_r_req_restarts(const struct sess *);\n");
        vsb_cat(sb, "const char * VRT_r_bereq_request(const struct sess *);\n");
        vsb_cat(sb, "void VRT_l_bereq_request(const struct sess *, const char *, ...);\n");
        vsb_cat(sb, "const char * VRT_r_bereq_url(const struct sess *);\n");

diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index 624c3454f722a1740f3e9a8c616bf47abcf4c366..c50a11ff23f0e9df6ce82220f6c680720ee58fb0 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -92,6 +92,11 @@ set spobj {
                {recv pipe pass hash miss hit fetch                        }
                "struct sess *"
        }
+       { req.restarts
+               RO INT
+               {recv pipe pass hash miss hit fetch deliver                }
+               "const struct sess *"
+       }
 
        # Request sent to backend
        { bereq.request

diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c
index 21bb81688fc165fca047d76e357e0e700d799dd6..7c01cb50229fa1d69aadbdc2a04cf1e19650b1d4 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_obj.c
+++ b/varnish-cache/lib/libvcl/vcc_obj.c
@@ -98,6 +98,13 @@ struct var vcc_vars[] = {
            0,
            VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH
        },
+       { "req.restarts", INT, 12,
+           "VRT_r_req_restarts(sp)",
+           NULL,
+           V_RO,
+           0,
+           VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
+       },
        { "bereq.request", STRING, 13,
            "VRT_r_bereq_request(sp)",
            "VRT_l_bereq_request(sp, ",