[master] 5efe0cd Add a backpointer from boc to busyobj for now.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Jan 28 12:49:19 CET 2016
commit 5efe0cda4edb9f652856b3d907a7483264e84fa8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jan 20 20:28:16 2016 +0000
Add a backpointer from boc to busyobj for now.
I don't think this will be necessary at the end state, but it makes
the transformation easier.
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index d314942..596e572 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -399,6 +399,7 @@ struct boc {
enum busyobj_state_e state;
uint8_t *vary;
+ struct busyobj *busyobj;
};
/* Object core structure ---------------------------------------------
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index c7c562b..4c199a3 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -71,6 +71,7 @@ vbo_New(void)
INIT_OBJ(bo->boc, BOC_MAGIC);
Lck_New(&bo->boc->mtx, lck_busyobj);
AZ(pthread_cond_init(&bo->boc->cond, NULL));
+ bo->boc->busyobj = bo;
return (bo);
}
More information about the varnish-commit
mailing list