Changeset 4100 for trunk/varnish-cache/include/vcl.h

Timestamp:

06/09/09 12:41:38 (14 months ago)

Author:

phk

Message:

Remove the vcl_timeout{} VCL callback.

We had big plans for this originally, but none of them have materialized
because there are better ways to do those things.

For instance: why invent a lot of code to do prefetch, when wget(1) can
do the job already ?

Getting rid of vcl_timeout{} (and vcl_discard{}, see yesterdays commit)
simplifies the expiry codes locking and statekeeping significantly.

Files:

• trunk/varnish-cache/include/vcl.h (modified) (2 diffs)

trunk/varnish-cache/include/vcl.h

@@ -23 +23 @@
 #define VCL_MET_FETCH           (1 << 6)
 #define VCL_MET_DELIVER         (1 << 7)
-#define VCL_MET_TIMEOUT         (1 << 8)
-#define VCL_MET_ERROR           (1 << 9)
+#define VCL_MET_ERROR           (1 << 8)
 
-#define VCL_MET_MAX             10
+#define VCL_MET_MAX             9
 
 /* VCL Returns */
@@ -70 +69 @@
         vcl_func_f      *fetch_func;
         vcl_func_f      *deliver_func;
-        vcl_func_f      *timeout_func;
         vcl_func_f      *error_func;
 };