summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-03-06 12:21:33 +0000
committerTor Egge <Tor.Egge@oath.com>2018-03-06 12:21:33 +0000
commit0660317cc8304b16d178312bcafacb27ece2842b (patch)
tree3ee3165a84dabafdada818c4a8f0d1eb034202d8
parent9258dde254882c6e21ea93b282098729cc68c6cf (diff)
Move ExecutorThreadingServiceStats to metrics directory.
-rw-r--r--searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt1
-rw-r--r--searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.cpp (renamed from searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.cpp)0
-rw-r--r--searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.h (renamed from searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.h)0
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/documentdb.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp2
6 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
index 95d5f153f35..6fe95da2197 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
@@ -7,6 +7,7 @@ vespa_add_library(searchcore_proton_metrics STATIC
documentdb_metrics_collection.cpp
documentdb_tagged_metrics.cpp
executor_metrics.cpp
+ executor_threading_service_stats.cpp
job_load_sampler.cpp
job_tracker.cpp
job_tracked_flush_target.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.cpp b/searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.cpp
index c17731efbc5..c17731efbc5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.h b/searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.h
index 7fbff6e5eb0..7fbff6e5eb0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_stats.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_threading_service_stats.h
diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
index cabbc5c101c..8ee6a4f73ae 100644
--- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
@@ -34,7 +34,6 @@ vespa_add_library(searchcore_server STATIC
documentsubdbcollection.cpp
emptysearchview.cpp
executor_thread_service.cpp
- executor_threading_service_stats.cpp
executorthreadingservice.cpp
fast_access_doc_subdb.cpp
fast_access_doc_subdb_configurer.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 2c37d847ba3..8cb64dc05f9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -11,7 +11,7 @@
#include "maintenance_jobs_injector.h"
#include "reconfig_params.h"
#include "bootstrapconfig.h"
-#include "executor_threading_service_stats.h"
+#include <vespa/searchcore/proton/metrics/executor_threading_service_stats.h>
#include <vespa/searchcore/proton/attribute/attribute_writer.h>
#include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
#include <vespa/searchcore/proton/common/eventlogger.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
index 9a9bc3d2904..1c4825753a8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
@@ -2,7 +2,7 @@
#include "executorthreadingservice.h"
#include <vespa/vespalib/util/executor.h>
-#include "executor_threading_service_stats.h"
+#include <vespa/searchcore/proton/metrics/executor_threading_service_stats.h>
using vespalib::ThreadStackExecutorBase;