summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--messagebus/src/vespa/messagebus/messagebus.cpp4
-rw-r--r--messagebus/src/vespa/messagebus/routablequeue.cpp2
-rw-r--r--messagebus/src/vespa/messagebus/sequencer.cpp2
-rw-r--r--messagebus/src/vespa/messagebus/sourcesession.cpp2
-rw-r--r--messagebus/src/vespa/messagebus/testlib/receptor.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributemanager.cpp2
-rw-r--r--vespalib/src/vespa/vespalib/util/ptrholder.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/messagebus/src/vespa/messagebus/messagebus.cpp b/messagebus/src/vespa/messagebus/messagebus.cpp
index 5a8f510ddcf..fa646b55221 100644
--- a/messagebus/src/vespa/messagebus/messagebus.cpp
+++ b/messagebus/src/vespa/messagebus/messagebus.cpp
@@ -83,7 +83,7 @@ namespace mbus {
MessageBus::MessageBus(INetwork &net, ProtocolSet protocols) :
_network(net),
- _lock("mbus::MessageBus::_lock", false),
+ _lock(),
_routingTables(),
_sessions(),
_protocolRepository(std::make_unique<ProtocolRepository>()),
@@ -106,7 +106,7 @@ MessageBus::MessageBus(INetwork &net, ProtocolSet protocols) :
MessageBus::MessageBus(INetwork &net, const MessageBusParams &params) :
_network(net),
- _lock("mbus::MessageBus::_lock", false),
+ _lock(),
_routingTables(),
_sessions(),
_protocolRepository(std::make_unique<ProtocolRepository>()),
diff --git a/messagebus/src/vespa/messagebus/routablequeue.cpp b/messagebus/src/vespa/messagebus/routablequeue.cpp
index 863cbdb3180..a3ba2ffadd3 100644
--- a/messagebus/src/vespa/messagebus/routablequeue.cpp
+++ b/messagebus/src/vespa/messagebus/routablequeue.cpp
@@ -5,7 +5,7 @@
namespace mbus {
RoutableQueue::RoutableQueue()
- : _monitor("mbus::RoutableQueue::_monitor", true),
+ : _monitor(),
_queue()
{ }
diff --git a/messagebus/src/vespa/messagebus/sequencer.cpp b/messagebus/src/vespa/messagebus/sequencer.cpp
index 60fb3bdd39e..97fa2641504 100644
--- a/messagebus/src/vespa/messagebus/sequencer.cpp
+++ b/messagebus/src/vespa/messagebus/sequencer.cpp
@@ -8,7 +8,7 @@ using vespalib::make_string;
namespace mbus {
Sequencer::Sequencer(IMessageHandler &sender) :
- _lock("mbus::Sequencer::_lock", false),
+ _lock(),
_sender(sender),
_seqMap()
{
diff --git a/messagebus/src/vespa/messagebus/sourcesession.cpp b/messagebus/src/vespa/messagebus/sourcesession.cpp
index 1dbdd307e17..dafae0b9b1d 100644
--- a/messagebus/src/vespa/messagebus/sourcesession.cpp
+++ b/messagebus/src/vespa/messagebus/sourcesession.cpp
@@ -12,7 +12,7 @@ using vespalib::make_string;
namespace mbus {
SourceSession::SourceSession(MessageBus &mbus, const SourceSessionParams &params)
- : _monitor("mbus::SourceSession::_monitor", false),
+ : _monitor(),
_mbus(mbus),
_gate(new ReplyGate(_mbus)),
_sequencer(*_gate),
diff --git a/messagebus/src/vespa/messagebus/testlib/receptor.cpp b/messagebus/src/vespa/messagebus/testlib/receptor.cpp
index 71ceff6b2fe..f821021a482 100644
--- a/messagebus/src/vespa/messagebus/testlib/receptor.cpp
+++ b/messagebus/src/vespa/messagebus/testlib/receptor.cpp
@@ -7,7 +7,7 @@ namespace mbus {
Receptor::Receptor()
: IMessageHandler(),
IReplyHandler(),
- _mon("mbus::Receptor::_mon", true),
+ _mon(),
_msg(),
_reply()
{ }
diff --git a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
index ff8c055ff45..0122516b767 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
@@ -19,7 +19,7 @@ using search::attribute::IAttributeContext;
namespace {
-vespalib::Monitor baseDirMonitor("attributemanagerbasedir", false);
+vespalib::Monitor baseDirMonitor;
typedef std::set<string> BaseDirSet;
BaseDirSet baseDirSet;
diff --git a/vespalib/src/vespa/vespalib/util/ptrholder.h b/vespalib/src/vespa/vespalib/util/ptrholder.h
index 3e807a8a93d..1c06e5c53e6 100644
--- a/vespalib/src/vespa/vespalib/util/ptrholder.h
+++ b/vespalib/src/vespa/vespalib/util/ptrholder.h
@@ -38,7 +38,7 @@ public:
* @brief Create an empty PtrHolder with both current and new
* pointers set to 0
**/
- PtrHolder() : _current(), _next(), _lock("PtrHolder", false) {}
+ PtrHolder() : _current(), _next(), _lock() {}
/**
* @brief Empty destructor