[master] f67315c Move n_vampireobject increment to the persistent stevedore

[Martin Blix Grydeland]

commit f67315c52a86bcfe2944b71369ed4cf948412356
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Feb 23 16:45:17 2016 +0100

    Move n_vampireobject increment to the persistent stevedore
    
    This keeps the increment and decrement in the same compilation unit.

diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 7ab868f..86523be 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -297,7 +297,6 @@ HSH_Insert(struct worker *wrk, const void *digest, struct objcore *oc,
 	if (!VTAILQ_EMPTY(&oh->waitinglist))
 		hsh_rush(wrk, oh);
 	Lck_Unlock(&oh->mtx);
-	wrk->stats->n_vampireobject++;
 }
 
 /*---------------------------------------------------------------------
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index 1a03708..61ae93b 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -174,6 +174,7 @@ smp_load_seg(struct worker *wrk, const struct smp_sc *sc,
 		AN(oc->ban);
 		HSH_DerefBoc(wrk, oc);	// XXX Keep it an stream resurrection?
 		(void)HSH_DerefObjCore(wrk, &oc);
+		wrk->stats->n_vampireobject++;
 	}
 	Pool_Sumstat(wrk);
 	sg->flags |= SMP_SEG_LOADED;