Changeset 1506

Timestamp:

10/06/07 10:49:43 (3 years ago)

Author:

phk

Message:

Take a shot at light-weight "Vary:" processing.

When we cache an object with a "Vary:" header, we generate
a "vary matching string" which can be used to efficiently
check for compliance when doing a cache lookup.

Only very lightly tested (ie: cnn.com).

For a full description of the reasoning, please see

 http://varnish.projects.linpro.no/wiki/ArchitectureVary

Location:

trunk/varnish-cache/bin/varnishd

Files:

• Makefile.am (modified) (1 diff)
• cache.h (modified) (2 diffs)
• cache_center.c (modified) (1 diff)
• cache_hash.c (modified) (3 diffs)
• cache_vary.c (added)

trunk/varnish-cache/bin/varnishd/Makefile.am

@@ -26 +26 @@
         cache_session.c \
         cache_synthetic.c \
+        cache_vary.c \
         cache_vcl.c \
         cache_vrt.c \

trunk/varnish-cache/bin/varnishd/cache.h

@@ -225 +225 @@
         unsigned                xid;
         struct objhead          *objhead;
+
+        unsigned char           *vary;
 
         unsigned                heap_idx;
@@ -463 +465 @@
 /* cache_synthetic.c */
 void SYN_ErrorPage(struct sess *sp, int status, const char *reason, int ttl);
+
+/* cache_vary.c */
+void VRY_Create(struct sess *sp);
+int VRY_Match(struct sess *sp, unsigned char *vary);
 
 /* cache_vcl.c */

trunk/varnish-cache/bin/varnishd/cache_center.c

@@ -299 +299 @@
         sp->obj->cacheable = 1;
         if (sp->obj->objhead != NULL) {
+                VRY_Create(sp);
                 HSH_Ref(sp->obj); /* get another, STP_DELIVER will deref */
                 HSH_Unbusy(sp->obj);

trunk/varnish-cache/bin/varnishd/cache_hash.c

@@ -149 +149 @@
                 }
         were_back:
-                /* XXX: check Vary: */
                 if (!o->cacheable) {
                         /* ignore */
@@ -160 +159 @@
                         VSL(SLT_ExpBan, 0, "%u was banned", o->xid);
                         EXP_TTLchange(o);
-                } else
+                } else if (VRY_Match(sp, o->vary))
                         break;
                 o->refcnt--;
@@ -255 +254 @@
                 free(o->http.ws->s);
 
+        if (o->vary != NULL)
+                free(o->vary);
+
         HSH_Freestore(o);
         free(o);