Give the stevedores alloc method a flag that tells that we are allocating

an object structure.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4266 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/stevedore.c

@@ -169,7 +169,7 @@ STV_alloc(struct sess *sp, size_t size)
 
 		/* try to allocate from it */
 		AN(stv->alloc);
-		st = stv->alloc(stv, size);
+		st = stv->alloc(stv, size, 0);
 		if (st != NULL)
 			break;
 

bin/varnishd/stevedore.h

@@ -36,7 +36,7 @@ struct object;
 
 typedef void storage_init_f(struct stevedore *, int ac, char * const *av);
 typedef void storage_open_f(const struct stevedore *);
-typedef struct storage *storage_alloc_f(struct stevedore *, size_t size);
+typedef struct storage *storage_alloc_f(struct stevedore *, size_t size, int isobj);
 typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size, double ttl);
 typedef void storage_trim_f(struct storage *, size_t size);
 typedef void storage_free_f(struct storage *);

bin/varnishd/storage_file.c

@@ -461,11 +461,12 @@ smf_open(const struct stevedore *st)
 /*--------------------------------------------------------------------*/
 
 static struct storage *
-smf_alloc(struct stevedore *st, size_t size)
+smf_alloc(struct stevedore *st, size_t size, int isobj)
 {
 	struct smf *smf;
 	struct smf_sc *sc = st->priv;
 
+	(void)isobj;
 	assert(size > 0);
 	size += (sc->pagesize - 1);
 	size &= ~(sc->pagesize - 1);

bin/varnishd/storage_malloc.c

@@ -53,10 +53,11 @@ struct sma {
 };
 
 static struct storage *
-sma_alloc(struct stevedore *st, size_t size)
+sma_alloc(struct stevedore *st, size_t size, int isobj)
 {
 	struct sma *sma;
 
+	(void)isobj;
 	Lck_Lock(&sma_mtx);
 	VSL_stats->sma_nreq++;
 	if (VSL_stats->sma_nbytes + size > sma_max)

bin/varnishd/storage_persistent.c

@@ -1220,13 +1220,14 @@ smp_object(const struct sess *sp)
  */
 
 static struct storage *
-smp_alloc(struct stevedore *st, size_t size)
+smp_alloc(struct stevedore *st, size_t size, int isobj)
 {
 	struct smp_sc *sc;
 	struct storage *ss;
 	struct smp_seg *sg;
 	size_t sz2;
 
+	(void)isobj;
 	CAST_OBJ_NOTNULL(sc, st->priv, SMP_SC_MAGIC);
 
 	Lck_Lock(&sc->mtx);