hip-vdi changes

src/core/loader.h

@@ -172,11 +172,10 @@ typedef BaseLoader<RocTxApi> RocTxLoader;
 #define LOADER_INSTANTIATE() \
   template<class T> typename roctracer::BaseLoader<T>::mutex_t roctracer::BaseLoader<T>::mutex_; \
   template<class T> std::atomic<roctracer::BaseLoader<T>*> roctracer::BaseLoader<T>::instance_{}; \
-  template<class T> const bool roctracer::BaseLoader<T>::strong_ld_check_ = false;
+  template<class T> const bool roctracer::BaseLoader<T>::strong_ld_check_ = true; \
   template<> const char* roctracer::HipLoader::lib_name_ = "libhip_hcc.so"; \
   template<> const char* roctracer::HccLoader::lib_name_ = "libmcwamp_hsa.so"; \
   template<> const char* roctracer::KfdLoader::lib_name_ = "libkfdwrapper64.so"; \
-  template<> const char* roctracer::RocTxLoader::lib_name_ = "libroctx64.so"; \
-  template<> const bool roctracer::RocTxLoader::strong_ld_check_ = false;
+  template<> const char* roctracer::RocTxLoader::lib_name_ = "libroctx64.so";
 
 #endif // SRC_CORE_LOADER_H_

src/core/roctracer.cpp

@@ -324,10 +324,12 @@ void* HIP_SyncActivityCallback(
     if ((data == NULL) && (pool != NULL)) EXC_ABORT(ROCTRACER_STATUS_ERROR, "ActivityCallback enter: pool is not NULL");
     // Allocating a record if NULL passed
     if (record == NULL) {
+      if (data != NULL) EXC_ABORT(ROCTRACER_STATUS_ERROR, "ActivityCallback enter: record is NULL");
       record_pair_stack.push({});
       auto& top = record_pair_stack.top();
       record = &(top.record);
       data_ptr = &(top.data.hip);
+      data = data_ptr;
     }
 
     // Filing record info