added instance names

Author: mkalkbrenner

src/ZeDMDComm.cpp

@@ -35,26 +35,26 @@ ZeDMDComm::ZeDMDComm()
 
 ZeDMDComm::~ZeDMDComm()
 {
-  Log("ZeDMDComm destructor start: connected=%d queue_empty=%d delayed=%d", (int)IsConnected(), (int)IsQueueEmpty(),
-      (int)m_delayedFrameReady);
+  Log("ZeDMDComm[%s@%p] destructor start: connected=%d queue_empty=%d delayed=%d", m_instanceName, (void*)this,
+      (int)IsConnected(), (int)IsQueueEmpty(), (int)m_delayedFrameReady);
 
   m_stopFlag.store(true, std::memory_order_release);
   Disconnect();
 
   if (m_pThread)
   {
-    Log("ZeDMDComm destructor: joining run thread");
+    Log("ZeDMDComm[%s@%p] destructor: joining run thread", m_instanceName, (void*)this);
     if (m_pThread->joinable())
     {
       m_pThread->join();
     }
-    Log("ZeDMDComm destructor: joined run thread");
+    Log("ZeDMDComm[%s@%p] destructor: joined run thread", m_instanceName, (void*)this);
 
     delete m_pThread;
     m_pThread = nullptr;
   }
 
-  Log("ZeDMDComm destructor finished");
+  Log("ZeDMDComm[%s@%p] destructor finished", m_instanceName, (void*)this);
 }
 
 void ZeDMDComm::SetLogCallback(ZeDMD_LogCallback callback, const void* userData)
@@ -84,7 +84,7 @@ void ZeDMDComm::Run()
   m_pThread = new std::thread(
       [this]()
       {
-        Log("ZeDMDComm run thread starting");
+        Log("ZeDMDComm[%s@%p] run thread starting", m_instanceName, (void*)this);
         m_stopFlag.load(std::memory_order_acquire);
 
         try
@@ -135,15 +135,15 @@ void ZeDMDComm::Run()
             }
           }
 
-          Log("ZeDMDComm run thread loop exited: connected=%d stop=%d", (int)IsConnected(),
-              (int)m_stopFlag.load(std::memory_order_relaxed));
+          Log("ZeDMDComm[%s@%p] run thread loop exited: connected=%d stop=%d", m_instanceName, (void*)this,
+              (int)IsConnected(), (int)m_stopFlag.load(std::memory_order_relaxed));
         }
         catch (...)
         {
-          Log("ZeDMDComm run thread caught unexpected exception");
+          Log("ZeDMDComm[%s@%p] run thread caught unexpected exception", m_instanceName, (void*)this);
         }
 
-        Log("ZeDMDComm run thread finished");
+        Log("ZeDMDComm[%s@%p] run thread finished", m_instanceName, (void*)this);
       });
 }
 

src/ZeDMDComm.h

@@ -265,6 +265,14 @@ class ZeDMDComm
   void Log(const char* format, ...);
 
  protected:
+  void SetInstanceName(const char* name)
+  {
+    if (!name) return;
+    const size_t maxLen = sizeof(m_instanceName) - 1;
+    strncpy(m_instanceName, name, maxLen);
+    m_instanceName[maxLen] = '\0';
+  }
+
   virtual bool SendChunks(const uint8_t* pData, uint16_t size);
   virtual void Reset();
   void ClearFrames();
@@ -314,6 +322,7 @@ class ZeDMDComm
   const void* m_logUserData = nullptr;
   uint64_t m_zoneHashes[128] = {0};
 
+  char m_instanceName[8] = "USB";
   char m_ignoredDevices[10][32] = {0};
   uint8_t m_ignoredDevicesCounter = 0;
   char m_device[32] = {0};

src/ZeDMDSpi.h

@@ -12,7 +12,8 @@
 #include <gpiod.h>
 #include <linux/spi/spidev.h>
 
-#if (defined(GPIOD_API_VERSION) && (GPIOD_API_VERSION >= 2)) || (defined(GPIOD_VERSION_MAJOR) && (GPIOD_VERSION_MAJOR >= 2))
+#if (defined(GPIOD_API_VERSION) && (GPIOD_API_VERSION >= 2)) || \
+    (defined(GPIOD_VERSION_MAJOR) && (GPIOD_VERSION_MAJOR >= 2))
 #define ZEDMD_GPIOD_API_V2 1
 #endif
 
@@ -29,6 +30,7 @@ class ZeDMDSpi : public ZeDMDComm
  public:
   ZeDMDSpi() : ZeDMDComm()
   {
+    SetInstanceName("SPI");
     m_compression = false;
     m_zoneStream = false;
     m_keepAliveNotSupported = true;

src/ZeDMDWiFi.h

@@ -19,7 +19,7 @@
 class ZeDMDWiFi : public ZeDMDComm
 {
  public:
-  ZeDMDWiFi() : ZeDMDComm() {}
+  ZeDMDWiFi() : ZeDMDComm() { SetInstanceName("WiFi"); }
   ~ZeDMDWiFi() { Disconnect(); }
 
   virtual bool Connect(const char* name_or_ip);