Hold a mutex for each log destination

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

diff --git a/varnish-cache/bin/varnishtest/vtc_log.c b/varnish-cache/bin/varnishtest/vtc_log.c
index 44b85be06194cc2f088c1946371cebc92e5bc958..e59a3f36763fc619d2a2683a7b80efb3c3e81497 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_log.c
+++ b/varnish-cache/bin/varnishtest/vtc_log.c
@@ -49,6 +49,7 @@ struct vtclog {
 #define VTCLOG_MAGIC   0x82731202
        const char      *id;
        struct vsb      *vsb;
+       pthread_mutex_t mtx;
 };
 
 struct vtclog *
@@ -60,6 +61,7 @@ vtc_logopen(const char *id)
        AN(vl); 
        vl->id = id;
        vl->vsb = vsb_newauto();
+       AZ(pthread_mutex_init(&vl->mtx, NULL));
        return (vl);
 }
 
@@ -80,6 +82,7 @@ vtc_log(struct vtclog *vl, unsigned lvl, const char *fmt, ...)
        assert(lvl < NLEAD);
        if (lvl > vtc_verbosity)
                return;
+       AZ(pthread_mutex_lock(&vl->mtx));
        vsb_printf(vl->vsb, "%s %-4s ", lead[lvl], vl->id);
        va_list ap;
        va_start(ap, fmt);
@@ -90,6 +93,7 @@ vtc_log(struct vtclog *vl, unsigned lvl, const char *fmt, ...)
        AZ(vsb_overflowed(vl->vsb));
        (void)fputs(vsb_data(vl->vsb), stdout);
        vsb_clear(vl->vsb);
+       AZ(pthread_mutex_unlock(&vl->mtx));
        if (lvl == 0)
                exit (1);
 }
@@ -108,6 +112,7 @@ vtc_dump(struct vtclog *vl, unsigned lvl, const char *pfx, const char *str)
                return;
        if (pfx == NULL)
                pfx = "";
+       AZ(pthread_mutex_lock(&vl->mtx));
        if (str == NULL) 
                vsb_printf(vl->vsb, "%s %-4s %s(null)\n",
                    lead[lvl], vl->id, pfx);
@@ -136,6 +141,7 @@ vtc_dump(struct vtclog *vl, unsigned lvl, const char *pfx, const char *str)
        AZ(vsb_overflowed(vl->vsb));
        (void)fputs(vsb_data(vl->vsb), stdout);
        vsb_clear(vl->vsb);
+       AZ(pthread_mutex_unlock(&vl->mtx));
        if (lvl == 0)
                exit (1);
 }