[C++] Add semantic version checks to sample tools. Issue #624.

aeron-io · Jun 6, 2019 · e1d8e36 · e1d8e36
1 parent a3932eb
commit e1d8e36
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/aeron-samples/src/main/cpp/AeronStat.cpp b/aeron-samples/src/main/cpp/AeronStat.cpp
@@ -86,10 +86,13 @@ int main (int argc, char** argv)
 
         const std::int32_t cncVersion = CncFileDescriptor::cncVersionVolatile(cncFile);
 
-        if (cncVersion != CncFileDescriptor::CNC_VERSION)
+        if (semanticVersionMajor(cncVersion) != semanticVersionMajor(CncFileDescriptor::CNC_VERSION))
         {
-            std::cerr << "CNC version not supported: file version=" << cncVersion << std::endl;
-            return -1;
+            std::cerr << "CNC version not supported: "
+                      << " file=" << semanticVersionToString(cncVersion)
+                      << " app=" << semanticVersionToString(CncFileDescriptor::CNC_VERSION) << std::endl;
+
+            return EXIT_FAILURE;
         }
 
         const std::int64_t clientLivenessTimeoutNs = CncFileDescriptor::clientLivenessTimeout(cncFile);

diff --git a/aeron-samples/src/main/cpp/DriverTool.cpp b/aeron-samples/src/main/cpp/DriverTool.cpp
@@ -105,9 +105,12 @@ int main (int argc, char** argv)
 
         const std::int32_t cncVersion = CncFileDescriptor::cncVersionVolatile(cncFile);
 
-        if (cncVersion != CncFileDescriptor::CNC_VERSION)
+        if (semanticVersionMajor(cncVersion) != semanticVersionMajor(CncFileDescriptor::CNC_VERSION))
         {
-            std::cerr << "CNC version not supported: file version=" << cncVersion << std::endl;
+            std::cerr << "CNC version not supported: "
+                      << " file=" << semanticVersionToString(cncVersion)
+                      << " app=" << semanticVersionToString(CncFileDescriptor::CNC_VERSION) << std::endl;
+
             return EXIT_FAILURE;
         }
 

diff --git a/aeron-samples/src/main/cpp/ErrorStat.cpp b/aeron-samples/src/main/cpp/ErrorStat.cpp
@@ -101,10 +101,13 @@ int main (int argc, char** argv)
 
         const std::int32_t cncVersion = CncFileDescriptor::cncVersionVolatile(cncFile);
 
-        if (cncVersion != CncFileDescriptor::CNC_VERSION)
+        if (semanticVersionMajor(cncVersion) != semanticVersionMajor(CncFileDescriptor::CNC_VERSION))
         {
-            std::cerr << "CNC version not supported: file version=" << cncVersion << std::endl;
-            return -1;
+            std::cerr << "CNC version not supported: "
+                      << " file=" << semanticVersionToString(cncVersion)
+                      << " app=" << semanticVersionToString(CncFileDescriptor::CNC_VERSION) << std::endl;
+
+            return EXIT_FAILURE;
         }
 
         AtomicBuffer errorBuffer = CncFileDescriptor::createErrorLogBuffer(cncFile);