Putting the vector on the inside of the struct to test thread sanity check

Author: haoxian2

src/acl_hal_mmd.cpp

@@ -188,40 +188,41 @@ unsigned acl_convert_mmd_capabilities(unsigned mmd_capabilities);
 const static size_t MIN_SOF_SIZE = 1;
 const static size_t MIN_PLL_CONFIG_SIZE = 1;
 
-// Helper function needed for dl libraries wrapper
-void *my_dlopen(const char *library_name, char **error_msg);
-void *my_dlsym(void *library, const char *function_name, char **error_msg);
-
 // Wrapper for dl libraries
 struct dl_wrapper_t {
-  void *mmd_lib;
-  dl_wrapper_t(const char *library_name, char **error_msg) {
-    this->mmd_lib = my_dlopen(library_name, error_msg);
-  }
+  std::vector<void *> mmd_libs;
+  dl_wrapper_t(){;}
   ~dl_wrapper_t() {
-    if (this->mmd_lib) {
+    for (void * mmd_lib : this->mmd_libs){
+      if (mmd_lib) {
 #ifdef _WIN32
-      FreeLibrary((HMODULE)this->mmd_lib);
+        FreeLibrary((HMODULE)mmd_lib);
 #else
-      dlclose(this->mmd_lib);
+        dlclose(mmd_lib);
 #endif
+      }
     }
   }
+
+  // destroy last element of mmd_libs
+  void pop_back(){
+    if (this->mmd_libs.back()){
+#ifdef _WIN32
+      FreeLibrary((HMODULE)this->mmd_libs.back());
+#else
+      dlclose(this->mmd_libs.back());
+#endif
+    }
+    this->mmd_libs.pop_back();
+  }
+
   // prohibit copying to avoid double-close of handle
   dl_wrapper_t(const dl_wrapper_t &) = delete;
   dl_wrapper_t &operator=(const dl_wrapper_t &) = delete;
-
-  // enable move for vector operations
-  dl_wrapper_t(dl_wrapper_t &&) noexcept {};
-
-  // return symbol
-  void *sym(const char *function_name, char **error_msg) {
-    return my_dlsym(this->mmd_lib, function_name, error_msg);
-  }
 };
 
 std::vector<acl_mmd_dispatch_t> internal_mmd_dispatch;
-std::vector<dl_wrapper_t> dl_wrapper_list;
+static dl_wrapper_t dl_wrapper;
 
 // Dynamically load board mmd & symbols
 static size_t num_board_pkgs;
@@ -601,9 +602,9 @@ cl_bool l_load_single_board_library(const char *library_name,
       return CL_FALSE;
   }
 #endif
-  dl_wrapper_list.emplace_back(library_name, &error_msg);
-  if (!dl_wrapper_list.back().mmd_lib) {
-    dl_wrapper_list.pop_back();
+  dl_wrapper.mmd_libs.push_back(my_dlopen(library_name, &error_msg));
+  if (!dl_wrapper.mmd_libs.back()) {
+    dl_wrapper.pop_back();
     std::cout << "Error: Could not load board library " << library_name;
     if (error_msg && error_msg[0] != '\0') {
       std::cout << " (error_msg: " << error_msg << ")";
@@ -613,18 +614,18 @@ cl_bool l_load_single_board_library(const char *library_name,
   }
 
   auto *test_symbol =
-      dl_wrapper_list.back().sym("aocl_mmd_get_offline_info", &error_msg);
+      my_dlsym(dl_wrapper.mmd_libs.back(), "aocl_mmd_get_offline_info", &error_msg);
   if (!test_symbol) {
     // On Linux, for custom libraries close the library (which was opened
     // locally) and then reopen globally. For Windows, there is no option (i.e.
     // it is always global)
 #ifdef __linux__
-    my_dlclose(dl_wrapper_list.back().mmd_lib);
+    my_dlclose(dl_wrapper.mmd_libs.back());
     ACL_HAL_DEBUG_MSG_VERBOSE(
         1, "This library is a custom library. Opening globally.\n");
-    dl_wrapper_list.back().mmd_lib = my_dlopen_global(library_name, &error_msg);
-    if (!dl_wrapper_list.back().mmd_lib) {
-      dl_wrapper_list.pop_back();
+    dl_wrapper.mmd_libs.back() = my_dlopen_global(library_name, &error_msg);
+    if (!dl_wrapper.mmd_libs.back()) {
+      dl_wrapper.pop_back();
       std::cout << "Error: Could not load custom library " << library_name;
       if (error_msg && error_msg[0] != '\0') {
         std::cout << " (error_msg: " << error_msg << ")";
@@ -637,7 +638,7 @@ cl_bool l_load_single_board_library(const char *library_name,
     if (load_libraries) {
       auto result = l_load_board_functions(
           &(internal_mmd_dispatch[num_boards_found]), library_name,
-          dl_wrapper_list.back().mmd_lib, error_msg);
+          dl_wrapper.mmd_libs.back(), error_msg);
       if (result == CL_FALSE) {
         std::cout << "Error: Could not load board library " << library_name
                   << " due to failure to load symbols\n";
@@ -1190,10 +1191,10 @@ static acl_mmd_dispatch_t *get_msim_mmd_layer() {
       ipa_simulator ? mmd_lib_name_ipa : mmd_lib_name_aoc;
 
   char *error_msg = nullptr;
-  dl_wrapper_list.emplace_back(mmd_lib_name, &error_msg);
+  dl_wrapper.mmd_libs.push_back(my_dlopen(mmd_lib_name, &error_msg));
   typedef acl_mmd_dispatch_t *(*fcn_type)();
-  if (!dl_wrapper_list.back().mmd_lib) {
-    dl_wrapper_list.pop_back();
+  if (!dl_wrapper.mmd_libs.back()) {
+    dl_wrapper.pop_back();
     std::cout << "Error: Could not load simulation MMD library "
               << mmd_lib_name;
     if (error_msg && error_msg[0] != '\0') {
@@ -1202,9 +1203,9 @@ static acl_mmd_dispatch_t *get_msim_mmd_layer() {
     std::cout << "\n";
     return nullptr;
   }
-  auto *sym = dl_wrapper_list.back().sym(sym_name, &error_msg);
+  auto *sym = my_dlsym(dl_wrapper.mmd_libs.back(), sym_name, &error_msg);
   if (!sym) {
-    dl_wrapper_list.pop_back();
+    dl_wrapper.pop_back();
     std::cout << "Error: Symbol " << sym_name
               << " not found in simulation MMD library ";
     if (error_msg && error_msg[0] != '\0') {