Keep track of active source addresses

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@523 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index b0a5555c472591720bed62434d933dbe6d8bdd7b..eea9d26ebd7ba34b93c80c34ac1101d984f6c464 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -73,11 +73,18 @@ SES_RefSrcAddr(struct sess *sp)
        c3 = NULL;
        TAILQ_FOREACH_SAFE(c, ch, list, c2) {
                if (c->sum == u && !strcmp(c->addr, sp->addr)) {
+                       if (c->nsess == 0)
+                               VSL_stats->n_srcaddr_act++;
                        c->nsess++;
                        c->ttl = now + CLIENT_TTL;
                        sp->srcaddr = c;
                        TAILQ_REMOVE(ch, c, list);
                        TAILQ_INSERT_TAIL(ch, c, list);
+                       if (0 && c3 != NULL) {
+                               TAILQ_REMOVE(ch, c3, list);
+                               VSL_stats->n_srcaddr--;
+                               free(c3);
+                       }
                        AZ(pthread_mutex_unlock(&ses_mtx));
                        return;
                }
@@ -93,6 +100,7 @@ SES_RefSrcAddr(struct sess *sp)
        }
        if (c3 == NULL) {
                c3 = malloc(sizeof *c3);
+               assert(c3 != NULL);
                if (c3 != NULL)
                        VSL_stats->n_srcaddr++;
        } else
@@ -105,6 +113,7 @@ SES_RefSrcAddr(struct sess *sp)
                c3->ttl = now + CLIENT_TTL;
                c3->nsess = 1;
                c3->sah = ch;
+               VSL_stats->n_srcaddr_act++;
                TAILQ_INSERT_TAIL(ch, c3, list);
        }
        sp->srcaddr = c3;
@@ -135,14 +144,17 @@ void
 SES_RelSrcAddr(struct sess *sp)
 {
 
-       if (sp->srcaddr == NULL) {
+       if (0 && sp->srcaddr == NULL) {
                /* XXX who comes this way ? */
                VSL(SLT_Debug, sp->fd, "had no srcaddr");
                return;
        }
        assert(sp->srcaddr != NULL);
        AZ(pthread_mutex_lock(&ses_mtx));
+       assert(sp->srcaddr->nsess > 0);
        sp->srcaddr->nsess--;
+       if (sp->srcaddr->nsess == 0)
+               VSL_stats->n_srcaddr_act--;
        sp->srcaddr = NULL;
        AZ(pthread_mutex_unlock(&ses_mtx));
 }

diff --git a/varnish-cache/include/stat_field.h b/varnish-cache/include/stat_field.h
index 655156e85e893d090ada30916dac4310b3f7777f..3ca5ebca13ae6c29512ba634eb0a5150e4877ae8 100644 (file)
--- a/varnish-cache/include/stat_field.h
+++ b/varnish-cache/include/stat_field.h
@@ -11,6 +11,7 @@ MAC_STAT(backend_conn,                uint64_t, "u", "Backend connections initiated")
 MAC_STAT(backend_recycle,      uint64_t, "u", "Backend connections recyles")
 
 MAC_STAT(n_srcaddr,            uint64_t, "u", "N struct srcaddr")
+MAC_STAT(n_srcaddr_act,                uint64_t, "u", "N active struct srcaddr")
 MAC_STAT(n_sess,               uint64_t, "u", "N struct sess")
 MAC_STAT(n_object,             uint64_t, "u", "N struct object")
 MAC_STAT(n_objecthead,         uint64_t, "u", "N struct objecthead")