[master] 1bce362 Revert "add some memory barriers in vsc"

Nils Goroll nils.goroll at uplex.de
Mon Jun 12 10:00:10 CEST 2017


commit 1bce36290e7f1867cd408560349ab94f438f3fdb
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jun 12 09:58:25 2017 +0200

    Revert "add some memory barriers in vsc"
    
    The problem must be elsewhere, vtest results show no improvement
    
    This reverts commit 57a3042d7ffeeba18eebdb8d717b7bceee93c534.

diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 79b431e..b5c11ad 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -46,7 +46,6 @@
 #include "vjsn.h"
 #include "vsb.h"
 #include "vend.h"
-#include "vmb.h"
 
 #include "vapi/vsc.h"
 #include "vapi/vsm.h"
@@ -274,7 +273,6 @@ vsc_add_pt(struct vsc *vsc, const volatile void *ptr,
 	pt->point.desc = desc;
 	pt->point.ptr = ptr;
 	pt->point.section = &vf->section;
-	VWMB();
 
 	VTAILQ_INSERT_TAIL(&vsc->pt_list, pt, list);
 }
@@ -484,7 +482,6 @@ VSC_Iter(struct vsm *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
 	if (fantom != NULL)
 		*fantom = vsc->iter_fantom;
 	VTAILQ_FOREACH(pt, &vsc->pt_list, list) {
-		VRMB();
 		i = func(priv, &pt->point);
 		if (i)
 			return (i);
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 7368c2d..ad03d0c 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -50,7 +50,6 @@
 #include "vsm_priv.h"
 #include "vsc_priv.h"
 #include "vtim.h"
-#include "vmb.h"
 
 #include "vapi/vsm.h"
 
@@ -113,7 +112,6 @@ VSM_SetVSC(struct vsm *vd, struct vsc *vsc)
 {
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 
-	VWMB();
 	vd->vsc = vsc;
 }
 
@@ -122,7 +120,6 @@ VSM_GetVSC(const struct vsm *vd)
 {
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 
-	VRMB();
 	return (vd->vsc);
 }
 



More information about the varnish-commit mailing list