Merge amd-dev into amd-master 20240719

Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Change-Id: Id47efb0e83a5bfcf2fdc996ab2d0e4e20bc0ab9b

amdsmi_cli/amdsmi_helpers.py

@@ -31,6 +31,7 @@ from subprocess import run
 from subprocess import PIPE, STDOUT
 from typing import List
 from enum import Enum
+from typing import Set
 
 from amdsmi_init import *
 from BDF import BDF
@@ -789,7 +790,7 @@ class AMDSMIHelpers():
         """
         return int(float(val) * unit_in / unit_out)
 
-    def get_pci_device_ids(self) -> set[str]:
+    def get_pci_device_ids(self) -> Set[str]:
         pci_devices_path = "/sys/bus/pci/devices"
         pci_devices: set[str] = set()
         for device in os.listdir(pci_devices_path):

third_party/shared_mutex/shared_mutex.cc

@@ -259,7 +259,7 @@ shared_mutex_t shared_mutex_init(const char *name, mode_t mode, bool retried) {
       std::vector<std::string> ids = lsof(shared_mutex_filename.c_str());
       if (ids.size() == 0) {  // no process is using it
         fprintf(stderr, "%d re-init the mutex %s since no one use it. ret:%d ptr:%p\n",
-              cur_pid, shared_mutex_filename, ret, reinterpret_cast<shared_mutex_t *>(addr)->ptr);
+              cur_pid, shared_mutex_filename.c_str(), ret, reinterpret_cast<shared_mutex_t *>(addr)->ptr);
         memset(mutex_ptr, 0, sizeof(pthread_mutex_t));
         // Set mutex.created == 1 so that it can be initialized latter.
         mutex.created = 1;