[C++]: for #480. Update C++ API for CnC file changes.

aeron-io · Mar 12, 2018 · 5513dd3 · 5513dd3
1 parent 0533f15
commit 5513dd3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/aeron-client/src/main/cpp/CncFileDescriptor.h b/aeron-client/src/main/cpp/CncFileDescriptor.h
@@ -66,13 +66,19 @@ using namespace aeron::concurrent;
 *  |                   Client Liveness Timeout                     |
 *  |                                                               |
 *  +---------------------------------------------------------------+
+*  |                    Driver Start Timestamp                     |
+*  |                                                               |
+*  +---------------------------------------------------------------+
+*  |                         Driver PID                            |
+*  |                                                               |
+*  +---------------------------------------------------------------+
 * </pre>
 */
 namespace CncFileDescriptor {
 
 static const std::string CNC_FILE = "cnc.dat";
 
-static const std::int32_t CNC_VERSION = 12;
+static const std::int32_t CNC_VERSION = 13;
 
 #pragma pack(push)
 #pragma pack(4)
@@ -85,6 +91,8 @@ struct MetaDataDefn
     std::int32_t counterValuesBufferLength;
     std::int32_t errorLogBufferLength;
     std::int64_t clientLivenessTimeout;
+    std::int64_t startTimestamp;
+    std::int64_t pid;
 };
 #pragma pack(pop)
 
@@ -170,6 +178,24 @@ inline static std::int64_t clientLivenessTimeout(MemoryMappedFile::ptr_t cncFile
     return metaData.clientLivenessTimeout;
 }
 
+inline static std::int64_t startTimestamp(MemoryMappedFile::ptr_t cncFile)
+{
+    AtomicBuffer metaDataBuffer(cncFile->getMemoryPtr(), convertSizeToIndex(cncFile->getMemorySize()));
+
+    const MetaDataDefn& metaData = metaDataBuffer.overlayStruct<MetaDataDefn>(0);
+
+    return metaData.startTimestamp;
+}
+
+inline static std::int64_t pid(MemoryMappedFile::ptr_t cncFile)
+{
+    AtomicBuffer metaDataBuffer(cncFile->getMemoryPtr(), convertSizeToIndex(cncFile->getMemorySize()));
+
+    const MetaDataDefn& metaData = metaDataBuffer.overlayStruct<MetaDataDefn>(0);
+
+    return metaData.pid;
+}
+
 }
 
 }

diff --git a/aeron-samples/src/main/cpp/AeronStat.cpp b/aeron-samples/src/main/cpp/AeronStat.cpp
@@ -93,6 +93,8 @@ int main (int argc, char** argv)
         }
 
         const std::int64_t clientLivenessTimeoutNs = CncFileDescriptor::clientLivenessTimeout(cncFile);
+        const std::int64_t startTimestamp = CncFileDescriptor::startTimestamp(cncFile);
+        const std::int64_t pid = CncFileDescriptor::pid(cncFile);
 
         AtomicBuffer metadataBuffer = CncFileDescriptor::createCounterMetadataBuffer(cncFile);
         AtomicBuffer valuesBuffer = CncFileDescriptor::createCounterValuesBuffer(cncFile);
@@ -110,8 +112,8 @@ int main (int argc, char** argv)
             std::printf("\033[H\033[2J");
 
             std::printf(
-                "%s - Aeron Stat (CnC v%" PRId32 "), client liveness %s ns\n",
-                currentTime, cncVersion, toStringWithCommas(clientLivenessTimeoutNs).c_str());
+                "%s - Aeron Stat (CnC v%" PRId32 "), pid %" PRId64 ", client liveness %s ns\n",
+                currentTime, cncVersion, pid, toStringWithCommas(clientLivenessTimeoutNs).c_str());
             std::printf("===========================\n");
 
             counters.forEach([&](std::int32_t counterId, std::int32_t, const AtomicBuffer&, const std::string& l)