Print device NUMA node with roc-list-cards

Author: kostorr

src/CardDescriptor.h

@@ -21,9 +21,10 @@ struct CardDescriptor
     boost::optional<int> serialNumber;
     PciId pciId;
     PciAddress pciAddress;
+    int32_t numaNode;
 };
 
 } // namespace roc
 } // namespace AliceO2
 
-#endif // ALICEO2_SRC_READOUTCARD_CARDDESCRIPTOR_H_
+#endif // ALICEO2_SRC_READOUTCARD_CARDDESCRIPTOR_H_

src/CommandLineUtilities/ProgramListCards.cxx

@@ -38,10 +38,10 @@ class ProgramListCards: public Program
 
       std::ostringstream table;
 
-      auto formatHeader = "  %-3s %-6s %-10s %-11s %-11s %-8s %-25s %-17s\n";
-      auto formatRow = "  %-3s %-6s %-10s 0x%-9s 0x%-9s %-8s %-25s %-17s\n";
+      auto formatHeader = "  %-3s %-6s %-10s %-11s %-11s %-5s %-8s %-25s %-17s\n";
+      auto formatRow = "  %-3s %-6s %-10s 0x%-9s 0x%-9s %-5s %-8s %-25s %-17s\n";
       auto header = (boost::format(formatHeader)
-          % "#" % "Type" % "PCI Addr" % "Vendor ID" % "Device ID" % "Serial" % "FW Version" % "Card ID").str();
+          % "#" % "Type" % "PCI Addr" % "Vendor ID" % "Device ID" % "NUMA" % "Serial" % "FW Version" % "Card ID").str();
       auto lineFat = std::string(header.length(), '=') + '\n';
       auto lineThin = std::string(header.length(), '-') + '\n';
 
@@ -53,6 +53,7 @@ class ProgramListCards: public Program
         const std::string na = "n/a";
         std::string firmware = na;
         std::string cardId = na;
+        std::string numaNode = std::to_string(card.numaNode);
         try {
           Parameters params = Parameters::makeParameters(card.pciAddress, 2);
           params.setBufferParameters(buffer_parameters::Null());
@@ -66,7 +67,7 @@ class ProgramListCards: public Program
         }
 
         auto format = boost::format(formatRow) % i % CardType::toString(card.cardType) % card.pciAddress.toString()
-            % card.pciId.vendor % card.pciId.device;
+            % card.pciId.vendor % card.pciId.device % card.numaNode;
 
         if (auto serial = card.serialNumber) {
           format % serial.get();

src/Dummy/DummyDmaChannel.cxx

@@ -14,7 +14,7 @@ namespace roc {
 namespace {
 CardDescriptor makeDummyDescriptor()
 {
-  return {CardType::Dummy, ChannelFactory::getDummySerialNumber(), PciId {"dummy", "dummy"}, PciAddress {0,0,0}};
+  return {CardType::Dummy, ChannelFactory::getDummySerialNumber(), PciId {"dummy", "dummy"}, PciAddress {0,0,0}, -1};
 }
 
 constexpr size_t TRANSFER_QUEUE_SIZE = 16;

src/RocPciDevice.cxx

@@ -53,7 +53,7 @@ PciAddress addressFromDevice(Pda::PdaDevice::PdaPciDevice pciDevice){
 }
 
 CardDescriptor defaultDescriptor() {
-  return {CardType::Unknown, -1, {"unknown", "unknown"}, PciAddress(0,0,0)};
+  return {CardType::Unknown, -1, {"unknown", "unknown"}, PciAddress(0,0,0), -1};
 }
 } // Anonymous namespace
 
@@ -65,7 +65,7 @@ void RocPciDevice::initWithSerial(int serialNumber)
       for (auto& pciDevice : mPdaDevice->getPciDevices(mPdaDevice)) {
         if (type.getSerial(pciDevice) == serialNumber) {
           Utilities::resetSmartPtr(mPciDevice, pciDevice);
-          mDescriptor = CardDescriptor{type.cardType, serialNumber, type.pciId, addressFromDevice(pciDevice)};
+          mDescriptor = CardDescriptor{type.cardType, serialNumber, type.pciId, addressFromDevice(pciDevice), PciDevice_getNumaNode(pciDevice.get())};
           return;
         }
       }
@@ -87,7 +87,7 @@ void RocPciDevice::initWithAddress(const PciAddress& address)
       for (const auto& pciDevice : mPdaDevice->getPciDevices(mPdaDevice)) {
         if (addressFromDevice(pciDevice) == address) {
           Utilities::resetSmartPtr(mPciDevice, pciDevice);
-          mDescriptor = CardDescriptor { type.cardType, type.getSerial(pciDevice), type.pciId, address };
+          mDescriptor = CardDescriptor { type.cardType, type.getSerial(pciDevice), type.pciId, address, PciDevice_getNumaNode(pciDevice.get())};
           return;
         }
       }
@@ -132,7 +132,7 @@ std::vector<CardDescriptor> RocPciDevice::findSystemDevices()
   for (const auto& type : deviceTypes) {
     for (const auto& pciDevice : Pda::PdaDevice::getPciDevices(type.pciId)) {
       cards.push_back(CardDescriptor{type.cardType, type.getSerial(pciDevice), type.pciId,
-        addressFromDevice(pciDevice)});
+        addressFromDevice(pciDevice), PciDevice_getNumaNode(pciDevice.get())});
     }
   }
   return cards;
@@ -146,7 +146,7 @@ std::vector<CardDescriptor> RocPciDevice::findSystemDevices(int serialNumber)
       for (const auto& pciDevice : Pda::PdaDevice::getPciDevices(type.pciId)) {
         if (type.getSerial(pciDevice) == serialNumber) {
           cards.push_back(CardDescriptor{type.cardType, type.getSerial(pciDevice), type.pciId,
-                  addressFromDevice(pciDevice)});
+                  addressFromDevice(pciDevice), PciDevice_getNumaNode(pciDevice.get())});
         }
       }
     }
@@ -166,7 +166,7 @@ std::vector<CardDescriptor> RocPciDevice::findSystemDevices(const PciAddress& ad
     for (const auto& type : deviceTypes) {
       for (const auto& pciDevice : Pda::PdaDevice::getPciDevices(type.pciId)) {
         if (addressFromDevice(pciDevice) == address) {
-          cards.push_back(CardDescriptor{type.cardType, type.getSerial(pciDevice), type.pciId, address});
+          cards.push_back(CardDescriptor{type.cardType, type.getSerial(pciDevice), type.pciId, address, PciDevice_getNumaNode(pciDevice.get())});
         }
       }
     }