Avoid repeating long type names in code, "using" to the rescue.

7 files changed, 30 insertions, 20 deletions

diff --git a/searchcore/src/tests/proton/metrics/job_load_sampler/job_load_sampler_test.cpp b/searchcore/src/tests/proton/metrics/job_load_sampler/job_load_sampler_test.cpp
index c27de8cd7a4..21c5131b072 100644
--- a/searchcore/src/tests/proton/metrics/job_load_sampler/job_load_sampler_test.cpp
+++ b/searchcore/src/tests/proton/metrics/job_load_sampler/job_load_sampler_test.cpp
@@ -11,9 +11,14 @@ using namespace proton;
 
 constexpr double EPS = 0.000001;
 
-std::chrono::time_point<std::chrono::steady_clock> fakeTime(double now)
+using time_point = std::chrono::time_point<std::chrono::steady_clock>;
+using std::chrono::duration;
+using std::chrono::duration_cast;
+using std::chrono::steady_clock;
+
+time_point fakeTime(double now)
 {
-    return std::chrono::time_point<std::chrono::steady_clock>(std::chrono::duration_cast<std::chrono::steady_clock::duration>(std::chrono::duration<double>(now)));
+    return time_point(duration_cast<steady_clock::duration>(duration<double>(now)));
 }
 
 struct Fixture
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
index 85819cad53c..a95c0d24dfc 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.cpp
@@ -10,6 +10,8 @@ using searchcorespi::IFlushTarget;
 typedef IFlushTarget::Type FTT;
 typedef IFlushTarget::Component FTC;
 
+using time_point = std::chrono::time_point<std::chrono::steady_clock>;
+
 namespace proton {
 
 DocumentDBJobTrackers::DocumentDBJobTrackers()
@@ -68,7 +70,7 @@ namespace {
 double
 updateMetric(metrics::DoubleAverageMetric &metric,
              JobTracker &tracker,
-             std::chrono::time_point<std::chrono::steady_clock> now,
+             time_point now,
              const std::lock_guard<std::mutex> &guard)
 {
     double load = tracker.sampleLoad(now, guard);
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
index c95cdcf680a..17514f6ac4a 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/documentdb_job_trackers.h
@@ -19,7 +19,8 @@ class DocumentDBJobTrackers
 {
 private:
     std::mutex        _lock;
-    std::chrono::time_point<std::chrono::steady_clock> _now;
+    using time_point = std::chrono::time_point<std::chrono::steady_clock>;
+    time_point        _now;
     JobTracker::SP    _attributeFlush;
     JobTracker::SP    _memoryIndexFlush;
     JobTracker::SP    _diskIndexFusion;
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp
index caa93e4c43b..95fb6a0993d 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp
@@ -8,7 +8,7 @@ LOG_SETUP(".proton.metrics.job_load_sampler");
 namespace proton {
 
 void
-JobLoadSampler::updateIntegral(std::chrono::time_point<std::chrono::steady_clock> now, uint32_t jobCnt)
+JobLoadSampler::updateIntegral(time_point now, uint32_t jobCnt)
 {
     assert(now >= _lastUpdateTime);
     std::chrono::duration<double> duration = now - _lastUpdateTime;
@@ -16,7 +16,7 @@ JobLoadSampler::updateIntegral(std::chrono::time_point<std::chrono::steady_clock
     _lastUpdateTime = now;
 }
 
-JobLoadSampler::JobLoadSampler(std::chrono::time_point<std::chrono::steady_clock> now)
+JobLoadSampler::JobLoadSampler(time_point now)
     : _lastSampleTime(now),
       _lastUpdateTime(now),
       _currJobCnt(0),
@@ -25,19 +25,19 @@ JobLoadSampler::JobLoadSampler(std::chrono::time_point<std::chrono::steady_clock
 }
 
 void
-JobLoadSampler::startJob(std::chrono::time_point<std::chrono::steady_clock> now)
+JobLoadSampler::startJob(time_point now)
 {
     updateIntegral(now, _currJobCnt++);
 }
 
 void
-JobLoadSampler::endJob(std::chrono::time_point<std::chrono::steady_clock> now)
+JobLoadSampler::endJob(time_point now)
 {
     updateIntegral(now, _currJobCnt--);
 }
 
 double
-JobLoadSampler::sampleLoad(std::chrono::time_point<std::chrono::steady_clock> now)
+JobLoadSampler::sampleLoad(time_point now)
 {
     assert(now >= _lastSampleTime);
     updateIntegral(now, _currJobCnt);
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.h b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.h
index f56c3309ef3..5adbd0c5853 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.h
@@ -15,33 +15,34 @@ namespace proton {
 class JobLoadSampler
 {
 private:
-    std::chrono::time_point<std::chrono::steady_clock> _lastSampleTime;
-    std::chrono::time_point<std::chrono::steady_clock> _lastUpdateTime;
+    using time_point = std::chrono::time_point<std::chrono::steady_clock>;
+    time_point _lastSampleTime;
+    time_point _lastUpdateTime;
     uint32_t _currJobCnt;
     double _loadIntegral;
 
-    void updateIntegral(std::chrono::time_point<std::chrono::steady_clock> now, uint32_t jobCnt);
+    void updateIntegral(time_point now, uint32_t jobCnt);
 
 public:
     /**
      * Start the sampler with now (in seconds).
      */
-    JobLoadSampler(std::chrono::time_point<std::chrono::steady_clock> now);
+    JobLoadSampler(time_point now);
 
     /**
      * Signal that a job starts now (in seconds).
      */
-    void startJob(std::chrono::time_point<std::chrono::steady_clock> now);
+    void startJob(time_point now);
 
     /**
      * Signal that a job ends now (in seconds).
      */
-    void endJob(std::chrono::time_point<std::chrono::steady_clock> now);
+    void endJob(time_point now);
 
     /**
      * Samples the average load from previous sample time to now (in seconds).
      */
-    double sampleLoad(std::chrono::time_point<std::chrono::steady_clock> now);
+    double sampleLoad(time_point now);
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
index a3248b302a1..5c7dd5d8749 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
@@ -12,14 +12,14 @@ using fastos::ClockSystem;
 
 namespace proton {
 
-JobTracker::JobTracker(std::chrono::time_point<std::chrono::steady_clock> now, std::mutex &lock)
+JobTracker::JobTracker(time_point now, std::mutex &lock)
     : _sampler(now),
       _lock(lock)
 {
 }
 
 double
-JobTracker::sampleLoad(std::chrono::time_point<std::chrono::steady_clock> now, const std::lock_guard<std::mutex> &guard)
+JobTracker::sampleLoad(time_point now, const std::lock_guard<std::mutex> &guard)
 {
     (void) guard;
     return _sampler.sampleLoad(now);
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
index a3be41ea89d..fb5f9b336f3 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h
@@ -14,19 +14,20 @@ namespace proton {
 class JobTracker : public IJobTracker
 {
 private:
+    using time_point = std::chrono::time_point<std::chrono::steady_clock>;
     JobLoadSampler  _sampler;
     std::mutex     &_lock;
 
 public:
     typedef std::shared_ptr<JobTracker> SP;
 
-    JobTracker(std::chrono::time_point<std::chrono::steady_clock> now, std::mutex &lock);
+    JobTracker(time_point now, std::mutex &lock);
 
     /**
      * Samples the average job load from previous sample time to now (in seconds).
      * The caller of this function must take the guard on the lock referenced by this class.
      */
-    double sampleLoad(std::chrono::time_point<std::chrono::steady_clock> now, const std::lock_guard<std::mutex> &guard);
+    double sampleLoad(time_point now, const std::lock_guard<std::mutex> &guard);
 
     // Implements IJobTracker
     virtual void start();