add a fallback that loads the mdapi library with an explicit soversion (

#390)
intel · Nov 21, 2024 · c80a191 · c80a191
1 parent 8de5d56
commit c80a191
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/cliloader/printmetrics.h b/cliloader/printmetrics.h
@@ -41,6 +41,12 @@ static void* OpenLibrary()
 {
     void* ret = dlopen(cMDLibFileName, RTLD_LAZY | RTLD_LOCAL);
 #if !defined(__APPLE__)
+    if (ret == NULL)
+    {
+        // try adding an explicit soversion
+        std::string check(cMDLibFileName); check += ".1";
+        ret = dlopen(check.c_str(), RTLD_LAZY | RTLD_LOCAL);
+    }
     if (ret == NULL)
     {
         // old alternate name, may eventually be removed

diff --git a/intercept/mdapi/MetricsDiscoveryHelper.cpp b/intercept/mdapi/MetricsDiscoveryHelper.cpp
@@ -61,6 +61,12 @@ static void* OpenLibrary( const std::string& metricsLibraryName )
             ret = dlopen(cMDLibFileName, RTLD_LAZY | RTLD_LOCAL);
         }
 #if !defined(__APPLE__)
+        if (ret == NULL)
+        {
+            // try adding an explicit soversion
+            std::string check(cMDLibFileName); check += ".1";
+            ret = dlopen(check.c_str(), RTLD_LAZY | RTLD_LOCAL);
+        }
         if( ret == NULL )
         {
             // old alternate name, may eventually be removed