Some cleanup after major rebase.

3 files changed, 35 insertions, 29 deletions

diff --git a/storage/src/vespa/storage/storageserver/CMakeLists.txt b/storage/src/vespa/storage/storageserver/CMakeLists.txt
index 5ca7e074e6b..79ce0206005 100644
--- a/storage/src/vespa/storage/storageserver/CMakeLists.txt
+++ b/storage/src/vespa/storage/storageserver/CMakeLists.txt
@@ -8,6 +8,7 @@ vespa_add_library(storage_storageserver
     fnetlistener.cpp
     rpcrequestwrapper.cpp
     communicationmanager.cpp
+    communicationmanagermetrics.cpp
     statemanager.cpp
     documentapiconverter.cpp
     opslogger.cpp
diff --git a/storage/src/vespa/storage/storageserver/communicationmanagermetrics.cpp b/storage/src/vespa/storage/storageserver/communicationmanagermetrics.cpp
new file mode 100644
index 00000000000..d1e71b6e8a5
--- /dev/null
+++ b/storage/src/vespa/storage/storageserver/communicationmanagermetrics.cpp
@@ -0,0 +1,32 @@
+// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "communicationmanagermetrics.h"
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
+
+using namespace metrics;
+namespace storage {
+
+CommunicationManagerMetrics::CommunicationManagerMetrics(const LoadTypeSet& loadTypes, MetricSet* owner)
+    : MetricSet("communication", "", "Metrics for the communication manager", owner),
+      queueSize("messagequeue", "", "Size of input message queue.", this),
+      messageProcessTime(loadTypes,
+                         DoubleAverageMetric("messageprocesstime", "",
+                                             "Time transport thread uses to process a single message"),
+                         this),
+      exceptionMessageProcessTime(loadTypes,
+                                  DoubleAverageMetric("exceptionmessageprocesstime", "",
+                                                      "Time transport thread uses to process a single message "
+                                                      "that fails with an exception thrown into communication manager"),
+                                  this),
+      failedDueToTooLittleMemory("toolittlememory", "", "Number of messages failed due to too little memory available", this),
+      convertToStorageAPIFailures("convertfailures", "",
+                                  "Number of messages that failed to get converted to storage API messages", this),
+      sendCommandLatency("sendcommandlatency", "", "Average ms used to send commands to MBUS", this),
+      sendReplyLatency("sendreplylatency", "", "Average ms used to send replies to MBUS", this)
+{
+}
+
+CommunicationManagerMetrics::~CommunicationManagerMetrics() { }
+
+}
+
diff --git a/storage/src/vespa/storage/storageserver/communicationmanagermetrics.h b/storage/src/vespa/storage/storageserver/communicationmanagermetrics.h
index 4b580f79904..40c3646647e 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanagermetrics.h
+++ b/storage/src/vespa/storage/storageserver/communicationmanagermetrics.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <vespa/metrics/metrics.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
 
 namespace storage {
 
@@ -22,34 +21,8 @@ struct CommunicationManagerMetrics : public metrics::MetricSet {
     metrics::DoubleAverageMetric sendCommandLatency;
     metrics::DoubleAverageMetric sendReplyLatency;
 
-    CommunicationManagerMetrics(const metrics::LoadTypeSet& loadTypes,
-                                metrics::MetricSet* owner = 0)
-        : metrics::MetricSet("communication", "",
-                "Metrics for the communication manager", owner),
-          queueSize("messagequeue", "", "Size of input message queue.", this),
-          messageProcessTime(loadTypes, metrics::DoubleAverageMetric(
-                  "messageprocesstime", "",
-                  "Time transport thread uses to process a single message"),
-                  this),
-          exceptionMessageProcessTime(loadTypes, metrics::DoubleAverageMetric(
-                  "exceptionmessageprocesstime", "",
-                  "Time transport thread uses to process a single message "
-                  "that fails with an exception thrown into communication "
-                  "manager"),
-                  this),
-          failedDueToTooLittleMemory("toolittlememory", "",
-                  "Number of messages failed due to too little memory "
-                  "available", this),
-          convertToStorageAPIFailures("convertfailures", "",
-                  "Number of messages that failed to get converted to "
-                  "storage API messages", this),
-          sendCommandLatency("sendcommandlatency", "",
-                  "Average ms used to send commands to MBUS", this),
-          sendReplyLatency("sendreplylatency", "",
-                  "Average ms used to send replies to MBUS", this)
-    {
-    }
-
+    CommunicationManagerMetrics(const metrics::LoadTypeSet& loadTypes, metrics::MetricSet* owner = 0);
+    ~CommunicationManagerMetrics();
 };
 
 }