[master] 6b388a2 Give busyobj a copy of the hash-key so directors can access it.

Poul-Henning Kamp phk at FreeBSD.org
Tue Sep 23 10:30:57 CEST 2014


commit 6b388a2191bb5a39041d6000d56c5433e6b60724
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 23 08:30:24 2014 +0000

    Give busyobj a copy of the hash-key so directors can access it.
    
    (VDD14q3 item)

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 289ea28..316e9bc 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -517,6 +517,8 @@ struct busyobj {
 	struct vsl_log		vsl[1];
 
 	struct vsb		*synth_body;
+
+	uint8_t			digest[DIGEST_LEN];
 };
 
 
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 97b6645..5195688 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -151,6 +151,8 @@ VBO_GetBusyObj(struct worker *wrk, const struct req *req)
 	bo->t_first = bo->t_prev = NAN;
 	bo->doclose = SC_NULL;
 
+	memcpy(bo->digest, req->digest, sizeof bo->digest);
+
 	return (bo);
 }
 



More information about the varnish-commit mailing list