From 1a2bf75a4f301bb0481141ee23ff03f4050921b7 Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Wed, 23 Mar 2022 13:07:29 +0000
Subject: add some sanity checking

---
 config/src/vespa/config/frt/frtconnectionpool.cpp | 12 ++++++++----
 configutil/src/apps/configstatus/main.cpp         |  2 +-
 configutil/src/lib/configstatus.cpp               |  2 +-
 configutil/src/lib/configstatus.h                 |  2 +-
 configutil/src/lib/modelinspect.cpp               |  2 +-
 configutil/src/lib/modelinspect.h                 |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/config/src/vespa/config/frt/frtconnectionpool.cpp b/config/src/vespa/config/frt/frtconnectionpool.cpp
index 2ae812cd76e..0c11401e052 100644
--- a/config/src/vespa/config/frt/frtconnectionpool.cpp
+++ b/config/src/vespa/config/frt/frtconnectionpool.cpp
@@ -73,11 +73,13 @@ FRTConnectionPool::getNextRoundRobin()
     FRTConnection* nextFRTConnection = nullptr;
 
     if ( ! ready.empty()) {
-        int sel = _selectIdx % (int)ready.size();
+        unsigned int sel = _selectIdx % (int)ready.size();
+        LOG_ASSERT(sel < ready.size());
         _selectIdx = sel + 1;
         nextFRTConnection = ready[sel];
     } else if ( ! suspended.empty()) {
-        int sel = _selectIdx % (int)suspended.size();
+        unsigned int sel = _selectIdx % (int)suspended.size();
+        LOG_ASSERT(sel < suspended.size());
         _selectIdx = sel + 1;
         nextFRTConnection = suspended[sel];
     }
@@ -113,10 +115,12 @@ FRTConnectionPool::getNextHashBased()
     FRTConnection* nextFRTConnection = nullptr;
 
     if ( ! ready.empty()) {
-        int sel = std::abs(hashCode(_hostname) % (int)ready.size());
+        unsigned int sel = std::abs(hashCode(_hostname) % (int)ready.size());
+        LOG_ASSERT(sel < ready.size());
         nextFRTConnection = ready[sel];
     } else if ( ! suspended.empty() ){
-        int sel = std::abs(hashCode(_hostname) % (int)suspended.size());
+        unsigned int sel = std::abs(hashCode(_hostname) % (int)suspended.size());
+        LOG_ASSERT(sel < suspended.size());
         nextFRTConnection = suspended[sel];
     }
     return nextFRTConnection;
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp
index cd0424633d9..3656013cf2e 100644
--- a/configutil/src/apps/configstatus/main.cpp
+++ b/configutil/src/apps/configstatus/main.cpp
@@ -87,7 +87,7 @@ void Application::usage() {
 
 int Application::Main() {
     parseOpts();
-
+    fprintf(stderr, "Getting config from: %s\n", _specString.c_str());
     config::ServerSpec spec(_specString);
     config::ConfigUri uri = config::ConfigUri::createFromSpec(_cfgId, spec);
     ConfigStatus status(_flags, uri);
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 841d1604866..98a6bca7ba3 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -109,7 +109,7 @@ public:
 
 MyHttpHandler::~MyHttpHandler() = default;
 
-ConfigStatus::ConfigStatus(Flags flags, const config::ConfigUri uri)
+ConfigStatus::ConfigStatus(Flags flags, const config::ConfigUri &uri)
     : _cfg(), _flags(flags), _generation(0)
 {
     if (_flags.verbose) {
diff --git a/configutil/src/lib/configstatus.h b/configutil/src/lib/configstatus.h
index 4d792748419..7d658c9f2c2 100644
--- a/configutil/src/lib/configstatus.h
+++ b/configutil/src/lib/configstatus.h
@@ -22,7 +22,7 @@ public:
         {}
     };
 
-    ConfigStatus(Flags flags, const config::ConfigUri uri);
+    ConfigStatus(Flags flags, const config::ConfigUri &uri);
     ~ConfigStatus();
     int action();
 
diff --git a/configutil/src/lib/modelinspect.cpp b/configutil/src/lib/modelinspect.cpp
index d840a7d45ca..68544a55df4 100644
--- a/configutil/src/lib/modelinspect.cpp
+++ b/configutil/src/lib/modelinspect.cpp
@@ -21,7 +21,7 @@ ModelInspect::Flags::Flags(const Flags &) = default;
 ModelInspect::Flags & ModelInspect::Flags::operator = (const Flags &) = default;
 ModelInspect::Flags::~Flags() { }
 
-ModelInspect::ModelInspect(Flags flags, const config::ConfigUri uri, std::ostream &out)
+ModelInspect::ModelInspect(Flags flags, const config::ConfigUri &uri, std::ostream &out)
     : _cfg(), _flags(flags), _out(out)
 {
     if (_flags.verbose) {
diff --git a/configutil/src/lib/modelinspect.h b/configutil/src/lib/modelinspect.h
index 33ef94b259b..0c677b9d174 100644
--- a/configutil/src/lib/modelinspect.h
+++ b/configutil/src/lib/modelinspect.h
@@ -20,7 +20,7 @@ public:
         ~Flags();
     };
 
-    ModelInspect(Flags flags, const config::ConfigUri uri, std::ostream &out);
+    ModelInspect(Flags flags, const config::ConfigUri &uri, std::ostream &out);
     virtual ~ModelInspect();
 
     int action(int cnt, char *argv[]);
-- 
cgit v1.2.3