Use standard locking in searchlib (pass 1).

2 files changed, 13 insertions, 13 deletions

diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
index 8eef498d85c..e2dc6b2b2ef 100644
--- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
@@ -21,8 +21,6 @@ LOG_SETUP("attributebenchmark");
 
 #include <vespa/searchlib/attribute/attributevector.hpp>
 
-using vespalib::Monitor;
-using vespalib::MonitorGuard;
 using std::shared_ptr;
 
 typedef std::vector<uint32_t> NumVector;
diff --git a/searchlib/src/tests/attribute/runnable.h b/searchlib/src/tests/attribute/runnable.h
index b95d7d3843f..fb0a7cb1825 100644
--- a/searchlib/src/tests/attribute/runnable.h
+++ b/searchlib/src/tests/attribute/runnable.h
@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include <vespa/vespalib/util/sync.h>
+#include <mutex>
+#include <condition_variable>
 #include <vespa/fastos/thread.h>
 
 namespace search {
@@ -10,31 +11,32 @@ namespace search {
 class Runnable : public FastOS_Runnable
 {
 protected:
-    uint32_t _id;
-    vespalib::Monitor _cond;
-    bool _done;
-    bool _stopped;
+    uint32_t                _id;
+    std::mutex              _lock;
+    std::condition_variable _cond;
+    bool                    _done;
+    bool                    _stopped;
 
 public:
     Runnable(uint32_t id) :
-        _id(id), _cond(), _done(false), _stopped(false)
+        _id(id), _lock(), _cond(), _done(false), _stopped(false)
     { }
     void Run(FastOS_ThreadInterface *, void *) override {
         doRun();
 
-        vespalib::MonitorGuard guard(_cond);
+        std::lock_guard<std::mutex> guard(_lock);
         _stopped = true;
-        guard.broadcast();
+        _cond.notify_all();
     }
     virtual void doRun() = 0;
     void stop() {
-        vespalib::MonitorGuard guard(_cond);
+        std::lock_guard<std::mutex> guard(_lock);
         _done = true;
     }
     void join() {
-        vespalib::MonitorGuard guard(_cond);
+        std::unique_lock<std::mutex> guard(_lock);
         while (!_stopped) {
-            guard.wait();
+            _cond.wait(guard);
         }
     }
 };