r4667 - in trunk/varnish-cache: bin/varnishd include lib/libvcl
phk at varnish-cache.org
phk at varnish-cache.org
Fri Apr 16 11:58:02 CEST 2010
Author: phk
Date: 2010-04-16 11:58:02 +0200 (Fri, 16 Apr 2010)
New Revision: 4667
Modified:
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/hash_slinger.h
trunk/varnish-cache/include/vrt.h
trunk/varnish-cache/lib/libvcl/vcc_action.c
trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Carry out a bit of internal renaming, and recognize that it was a really
bad idea to call "bans" for "purges" some places.
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2010-04-16 09:58:02 UTC (rev 4667)
@@ -937,7 +937,7 @@
/*--------------------------------------------------------------------*/
void
-VRT_purge(struct sess *sp, char *cmds, ...)
+VRT_ban(struct sess *sp, char *cmds, ...)
{
char *a1, *a2, *a3;
va_list ap;
@@ -972,7 +972,7 @@
/*--------------------------------------------------------------------*/
void
-VRT_purge_string(struct sess *sp, const char *str, ...)
+VRT_ban_string(struct sess *sp, const char *str, ...)
{
char *p, *a1, *a2, *a3;
char **av;
Modified: trunk/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_slinger.h 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/bin/varnishd/hash_slinger.h 2010-04-16 09:58:02 UTC (rev 4667)
@@ -64,6 +64,7 @@
void HSH_DerefObjCore(struct sess *sp);
void HSH_FindBan(struct sess *sp, struct objcore **oc);
struct objcore *HSH_Insert(const struct sess *sp);
+void HSH_Purge(struct sess *, struct objhead *, double ttl, double grace);
#ifdef VARNISH_CACHE_CHILD
Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/include/vrt.h 2010-04-16 09:58:02 UTC (rev 4667)
@@ -136,8 +136,8 @@
void *, const char *);
void VRT_panic(struct sess *sp, const char *, ...);
-void VRT_purge(struct sess *sp, char *, ...);
-void VRT_purge_string(struct sess *sp, const char *, ...);
+void VRT_ban(struct sess *sp, char *, ...);
+void VRT_ban_string(struct sess *sp, const char *, ...);
void VRT_count(const struct sess *, unsigned);
int VRT_rewrite(const char *, const char *);
Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c 2010-04-16 09:58:02 UTC (rev 4667)
@@ -299,7 +299,7 @@
vcc_NextToken(tl);
if (tl->t->tok == VAR) {
- Fb(tl, 1, "VRT_purge(sp,\n");
+ Fb(tl, 1, "VRT_ban(sp,\n");
tl->indent += INDENT;
while (1) {
ExpectErr(tl, VAR);
@@ -353,7 +353,7 @@
Fb(tl, 1, "0);\n");
tl->indent -= INDENT;
} else {
- Fb(tl, 1, "VRT_purge_string(sp, ");
+ Fb(tl, 1, "VRT_ban_string(sp, ");
if (!vcc_StringVal(tl)) {
vcc_ExpectedStringval(tl);
return;
@@ -378,7 +378,7 @@
Expect(tl, '(');
vcc_NextToken(tl);
- Fb(tl, 1, "VRT_purge(sp, \"req.url\", \"~\", ");
+ Fb(tl, 1, "VRT_ban(sp, \"req.url\", \"~\", ");
if (!vcc_StringVal(tl)) {
vcc_ExpectedStringval(tl);
return;
Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2010-04-16 09:58:02 UTC (rev 4667)
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4428 2010-01-06 17:38:59Z tfheen $
*
* NB: This file is machine generated, DO NOT EDIT!
*
@@ -159,9 +159,10 @@
/* ../../include/vcl.h */
- vsb_cat(sb, "/*\n * $Id$\n *\n * NB: This file is machine generate");
- vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
- vsb_cat(sb, "en.tcl instead\n */\n\nstruct sess;\n");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4428 2010-01-06 17");
+ vsb_cat(sb, ":38:59Z tfheen $\n *\n * NB: This file is machine gen");
+ vsb_cat(sb, "erated, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixe");
+ vsb_cat(sb, "d_token.tcl instead\n */\n\nstruct sess;\n");
vsb_cat(sb, "struct cli;\n\ntypedef void vcl_init_f(struct cli *);\n");
vsb_cat(sb, "typedef void vcl_fini_f(struct cli *);\n");
vsb_cat(sb, "typedef int vcl_func_f(struct sess *sp);\n");
@@ -226,16 +227,16 @@
vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
- vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id$\n *\n");
- vsb_cat(sb, " * Runtime support for compiled VCL programs.\n");
- vsb_cat(sb, " *\n * XXX: When this file is changed, lib/libvcl/vcc_");
- vsb_cat(sb, "gen_fixed_token.tcl\n * XXX: *MUST* be rerun.\n");
- vsb_cat(sb, " */\n\nstruct sess;\nstruct vsb;\n");
- vsb_cat(sb, "struct cli;\nstruct director;\n");
- vsb_cat(sb, "struct VCL_conf;\nstruct sockaddr;\n");
- vsb_cat(sb, "\n/*\n * A backend probe specification\n");
- vsb_cat(sb, " */\n\nextern const void * const vrt_magic_string_end;");
- vsb_cat(sb, "\n\nstruct vrt_backend_probe {\n");
+ vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4428 2010-01-06 17:");
+ vsb_cat(sb, "38:59Z tfheen $\n *\n * Runtime support for compiled V");
+ vsb_cat(sb, "CL programs.\n *\n * XXX: When this file is changed, l");
+ vsb_cat(sb, "ib/libvcl/vcc_gen_fixed_token.tcl\n");
+ vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");
+ vsb_cat(sb, "\nstruct sess;\nstruct vsb;\nstruct cli;\n");
+ vsb_cat(sb, "struct director;\nstruct VCL_conf;\n");
+ vsb_cat(sb, "struct sockaddr;\n\n/*\n * A backend probe specificati");
+ vsb_cat(sb, "on\n */\n\nextern const void * const vrt_magic_string_");
+ vsb_cat(sb, "end;\n\nstruct vrt_backend_probe {\n");
vsb_cat(sb, "\tconst char\t*url;\n\tconst char\t*request;\n");
vsb_cat(sb, "\tdouble\t\ttimeout;\n\tdouble\t\tinterval;\n");
vsb_cat(sb, "\tunsigned\texp_status;\n\tunsigned\twindow;\n");
@@ -278,10 +279,10 @@
vsb_cat(sb, "const char *VRT_regsub(const struct sess *sp, int all,");
vsb_cat(sb, " const char *,\n void *, const char *);\n");
vsb_cat(sb, "\nvoid VRT_panic(struct sess *sp, const char *, ...);\n");
- vsb_cat(sb, "void VRT_purge(struct sess *sp, char *, ...);\n");
- vsb_cat(sb, "void VRT_purge_string(struct sess *sp, const char *, .");
- vsb_cat(sb, "..);\n\nvoid VRT_count(const struct sess *, unsigned);");
- vsb_cat(sb, "\nint VRT_rewrite(const char *, const char *);\n");
+ vsb_cat(sb, "void VRT_ban(struct sess *sp, char *, ...);\n");
+ vsb_cat(sb, "void VRT_ban_string(struct sess *sp, const char *, ...");
+ vsb_cat(sb, ");\n\nvoid VRT_count(const struct sess *, unsigned);\n");
+ vsb_cat(sb, "int VRT_rewrite(const char *, const char *);\n");
vsb_cat(sb, "void VRT_error(struct sess *, unsigned, const char *);");
vsb_cat(sb, "\nint VRT_switch_config(const char *);\n");
vsb_cat(sb, "\nenum gethdr_e { HDR_REQ, HDR_RESP, HDR_OBJ, HDR_BERE");
@@ -311,25 +312,27 @@
/* ../../include/vrt_obj.h */
- vsb_cat(sb, "/*\n * $Id$\n *\n * NB: This file is machine generate");
- vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
- vsb_cat(sb, "en.tcl instead\n */\n\nstruct sockaddr * VRT_r_client_");
- vsb_cat(sb, "ip(const struct sess *);\nstruct sockaddr * VRT_r_serv");
- vsb_cat(sb, "er_ip(struct sess *);\nconst char * VRT_r_server_hostn");
- vsb_cat(sb, "ame(struct sess *);\nconst char * VRT_r_server_identit");
- vsb_cat(sb, "y(struct sess *);\nint VRT_r_server_port(struct sess *");
- vsb_cat(sb, ");\nconst char * VRT_r_req_request(const struct sess *");
- vsb_cat(sb, ");\nvoid VRT_l_req_request(const struct sess *, const ");
- vsb_cat(sb, "char *, ...);\nconst char * VRT_r_req_url(const struct");
- vsb_cat(sb, " sess *);\nvoid VRT_l_req_url(const struct sess *, con");
- vsb_cat(sb, "st char *, ...);\nconst char * VRT_r_req_proto(const s");
- vsb_cat(sb, "truct sess *);\nvoid VRT_l_req_proto(const struct sess");
- vsb_cat(sb, " *, const char *, ...);\nvoid VRT_l_req_hash(struct se");
- vsb_cat(sb, "ss *, const char *);\nstruct director * VRT_r_req_back");
- vsb_cat(sb, "end(struct sess *);\nvoid VRT_l_req_backend(struct ses");
- vsb_cat(sb, "s *, struct director *);\nint VRT_r_req_restarts(const");
- vsb_cat(sb, " struct sess *);\ndouble VRT_r_req_grace(struct sess *");
- vsb_cat(sb, ");\nvoid VRT_l_req_grace(struct sess *, double);\n");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4428 2010-01-06 17");
+ vsb_cat(sb, ":38:59Z tfheen $\n *\n * NB: This file is machine gen");
+ vsb_cat(sb, "erated, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixe");
+ vsb_cat(sb, "d_token.tcl instead\n */\n\nstruct sockaddr * VRT_r_cl");
+ vsb_cat(sb, "ient_ip(const struct sess *);\n");
+ vsb_cat(sb, "struct sockaddr * VRT_r_server_ip(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_server_hostname(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_server_identity(struct sess *);\n");
+ vsb_cat(sb, "int VRT_r_server_port(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_req_request(const struct sess *);\n");
+ vsb_cat(sb, "void VRT_l_req_request(const struct sess *, const char");
+ vsb_cat(sb, " *, ...);\nconst char * VRT_r_req_url(const struct ses");
+ vsb_cat(sb, "s *);\nvoid VRT_l_req_url(const struct sess *, const c");
+ vsb_cat(sb, "har *, ...);\nconst char * VRT_r_req_proto(const struc");
+ vsb_cat(sb, "t sess *);\nvoid VRT_l_req_proto(const struct sess *, ");
+ vsb_cat(sb, "const char *, ...);\nvoid VRT_l_req_hash(struct sess *");
+ vsb_cat(sb, ", const char *);\nstruct director * VRT_r_req_backend(");
+ vsb_cat(sb, "struct sess *);\nvoid VRT_l_req_backend(struct sess *,");
+ vsb_cat(sb, " struct director *);\nint VRT_r_req_restarts(const str");
+ vsb_cat(sb, "uct sess *);\ndouble VRT_r_req_grace(struct sess *);\n");
+ vsb_cat(sb, "void VRT_l_req_grace(struct sess *, double);\n");
vsb_cat(sb, "const char * VRT_r_req_xid(struct sess *);\n");
vsb_cat(sb, "unsigned VRT_r_req_esi(struct sess *);\n");
vsb_cat(sb, "void VRT_l_req_esi(struct sess *, unsigned);\n");
Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c 2010-04-16 09:40:54 UTC (rev 4666)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c 2010-04-16 09:58:02 UTC (rev 4667)
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4428 2010-01-06 17:38:59Z tfheen $
*
* NB: This file is machine generated, DO NOT EDIT!
*
More information about the varnish-commit
mailing list