fix monitor queue locking

2021-03-16 10:59:56 -07:00
parent acb7156767
commit 21d9cb6b1c
2 changed files with 7 additions and 2 deletions
@@ -223,8 +223,11 @@ struct ServerMonitorControl : public server::MonitorControlOp
        if(val && mon->type && mon->type.get()!=Value::Helper::desc(val))
            throw std::logic_error("Type change not allowed in post().  Recommend pvxs::Value::cloneEmpty()");

-        if(testmask(val, mon->pvMask)) {
-            Guard G(mon->lock);
+        // pvMask is const at this point, so no need to lock
+        bool real = testmask(val, mon->pvMask);
+
+        Guard G(mon->lock);
+        if(real) {

            if((mon->queue.size() < mon->limit) || force || !val) {
                mon->queue.push_back(val);