add a cliloader option to print metric devices and exit

Author: bashbaug

cliloader/cliloader.cpp

@@ -381,6 +381,11 @@ static bool parseArguments(int argc, char *argv[])
             printMetrics();
             return false;
         }
+        else if (!strcmp(argv[i], "--metric-devices"))
+        {
+            printMetricDevices();
+            return false;
+        }
 #if defined(_WIN32)
         else if( !strcmp(argv[i], "--no-DLL-load") )
         {
@@ -591,6 +596,7 @@ static bool parseArguments(int argc, char *argv[])
             "  --debug                          Enable cliloader Debug Messages\n"
             "  --controls                       Print All Controls and Exit\n"
             "  --metrics                        Print All MDAPI Metrics and Exit\n"
+            "  --metric-devices                 Print All MDAPI Devices and Exit\n"
 #if defined(_WIN32)
             "  --no-DLL-load                    Do not load the Intercept DLL into the child process\n"
 #else // not Windows

cliloader/printmetrics.h

@@ -192,10 +192,11 @@ static bool printMetricsForAdapterGroup(void* pLibrary)
                 continue;
             }
 
-            fprintf(stderr, "\nAdapter: %s (%s)\n",
+            fprintf(stderr, "\nAdapter %u: %s (%s)\n",
+                a,
                 pAdapterParams->ShortName,
                 adapterTypeToString(pAdapterParams->Type));
-            fprintf(stderr, "PCI Vendor Id: %04X, Device Id: %04X, Bus Info: %02X:%02X.%02X\n",
+            fprintf(stderr, "\tPCI Vendor Id: %04X, Device Id: %04X, Bus Info: %02X:%02X.%02X\n",
                 pAdapterParams->VendorId,
                 pAdapterParams->DeviceId,
                 pAdapterParams->BusNumber,
@@ -295,8 +296,6 @@ static bool printMetricsForLegacyDevice(void* pLibrary)
 
 static bool printMetricsHelper()
 {
-    TCompletionCode res = CC_OK;
-
     void* pLibrary = OpenLibrary();
     if (pLibrary == NULL)
     {
@@ -313,9 +312,108 @@ static bool printMetricsHelper()
     return success;
 }
 
+static bool printMetricDevicesForAdapterGroup(void* pLibrary)
+{
+    TCompletionCode res = CC_OK;
+
+    OpenAdapterGroup_fn             OpenAdapterGroup;
+    OpenAdapterGroup = (OpenAdapterGroup_fn)GetFunctionAddress(pLibrary, "OpenAdapterGroup");
+    if (OpenAdapterGroup == NULL)
+    {
+        fprintf(stderr, "Couldn't get pointer to OpenAdapterGroup!\n");
+        return false;
+    }
+
+    IAdapterGroupLatest* pAdapterGroup = NULL;
+    res = OpenAdapterGroup(&pAdapterGroup);
+    if (res != CC_OK)
+    {
+        fprintf(stderr, "OpenAdapterGroup failed, res: %d\n", res);
+        return false;
+    }
+
+    const TAdapterGroupParamsLatest* pAdapterGroupParams = pAdapterGroup->GetParams();
+    if (NULL == pAdapterGroupParams)
+    {
+        fprintf(stderr, "AdapterGroup->GetParams() returned NULL\n");
+        return false;
+    }
+
+    fprintf(stderr, "MDAPI Headers: v%d.%d.%d, MDAPI Lib: v%d.%d.%d\n",
+        MD_API_MAJOR_NUMBER_CURRENT,
+        MD_API_MINOR_NUMBER_CURRENT,
+        MD_API_BUILD_NUMBER_CURRENT,
+        pAdapterGroupParams->Version.MajorNumber,
+        pAdapterGroupParams->Version.MinorNumber,
+        pAdapterGroupParams->Version.BuildNumber);
+    if (pAdapterGroupParams->Version.MajorNumber < 1 ||
+        (pAdapterGroupParams->Version.MajorNumber == 1 && pAdapterGroupParams->Version.MinorNumber < 1))
+    {
+        fprintf(stderr, "MDAPI Lib version must be at least v1.1!\n");
+    }
+    else
+    {
+        fprintf(stderr, "Found %u MDAPI Adapter%s.\n\n",
+            pAdapterGroupParams->AdapterCount,
+            pAdapterGroupParams->AdapterCount > 1 ? "s" : "");
+        for (uint32_t a = 0; a < pAdapterGroupParams->AdapterCount; a++)
+        {
+            IAdapterLatest* pAdapter = pAdapterGroup->GetAdapter(a);
+            if (NULL == pAdapter)
+            {
+                fprintf(stderr, "AdapterGroup->GetAdapter() returned NULL, skipping adapter.\n");
+                continue;
+            }
+
+            const TAdapterParamsLatest* pAdapterParams = pAdapter->GetParams();
+            if (NULL == pAdapterParams)
+            {
+                fprintf(stderr, "Adapter->GetParams() returned NULL, skipping adapter.\n");
+                continue;
+            }
+
+            fprintf(stderr, "\nAdapter %u: %s (%s)\n",
+                a,
+                pAdapterParams->ShortName,
+                adapterTypeToString(pAdapterParams->Type));
+            fprintf(stderr, "\tPCI Vendor Id: %04X, Device Id: %04X, Bus Info: %02X:%02X.%02X\n",
+                pAdapterParams->VendorId,
+                pAdapterParams->DeviceId,
+                pAdapterParams->BusNumber,
+                pAdapterParams->DeviceNumber,
+                pAdapterParams->FunctionNumber);
+        }
+    }
+
+    res = pAdapterGroup->Close();
+    if (res != CC_OK)
+    {
+        fprintf(stderr, "AdapterGroup->Close() failed, res: %d\n", res);
+    }
+
+    return true;
+}
+
+static bool printMetricDevicesHelper()
+{
+    void* pLibrary = OpenLibrary();
+    if (pLibrary == NULL)
+    {
+        fprintf(stderr, "Couldn't load metrics discovery library!\n");
+        return false;
+    }
+
+    return printMetricDevicesForAdapterGroup(pLibrary);
+}
+
 };
 
 static void printMetrics()
 {
     MetricsDiscovery::printMetricsHelper();
 }
+
+static void printMetricDevices()
+{
+    MetricsDiscovery::printMetricDevicesHelper();
+}