Collect executor stats once per metrics update and pass the info to both

metrics update method for document db legacy metrics and to metrics update
method for tagged document db metrics.

2 files changed, 20 insertions, 6 deletions

diff --git a/vespalib/src/vespa/vespalib/util/executor_stats.h b/vespalib/src/vespa/vespalib/util/executor_stats.h
new file mode 100644
index 00000000000..e8adfc62807
--- /dev/null
+++ b/vespalib/src/vespa/vespalib/util/executor_stats.h
@@ -0,0 +1,18 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+namespace vespalib {
+
+/**
+ * Struct representing stats for an executor.
+ **/
+struct ExecutorStats {
+    size_t maxPendingTasks;
+    size_t acceptedTasks;
+    size_t rejectedTasks;
+    ExecutorStats() : maxPendingTasks(0), acceptedTasks(0), rejectedTasks(0) {}
+};
+
+}
+
diff --git a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
index 1d8545781f5..9679e6379f5 100644
--- a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
+++ b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
@@ -11,6 +11,7 @@
 #include <memory>
 #include <vector>
 #include <functional>
+#include "executor_stats.h"
 
 class FastOS_ThreadPool;
 
@@ -39,12 +40,7 @@ public:
      * Internal stats that we want to observe externally. Note that
      * all stats are reset each time they are observed.
      **/
-    struct Stats {
-        size_t maxPendingTasks;
-        size_t acceptedTasks;
-        size_t rejectedTasks;
-        Stats() : maxPendingTasks(0), acceptedTasks(0), rejectedTasks(0) {}
-    };
+    using Stats = ExecutorStats;
 
     using init_fun_t = std::function<int(Runnable&)>;