use common helper

Author: PietroGhg

source/adapters/native_cpu/common.hpp

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "ur/ur.hpp"
+#include <mutex>
 
 constexpr size_t MaxMessageSize = 256;
 
@@ -63,8 +64,17 @@ struct _ur_object {
 
 struct RefCounted {
   std::atomic_uint32_t _refCount;
+  std::mutex _mutex;
   void incrementReferenceCount() { _refCount++; }
   void decrementReferenceCount() { _refCount--; }
   RefCounted() : _refCount{1} {}
   uint32_t getReferenceCount() const { return _refCount; }
 };
+
+template <typename T>
+inline void decrementOrDelete(T* refC) {
+  refC->decrementReferenceCount();
+  std::lock_guard<std::mutex> lock(refC->_mutex);
+  if (refC->getReferenceCount() == 0)
+    delete refC;
+}

source/adapters/native_cpu/context.cpp

@@ -32,15 +32,13 @@ urContextCreate(uint32_t DeviceCount, const ur_device_handle_t *phDevices,
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urContextRetain(ur_context_handle_t hContext) {
-  std::ignore = hContext;
-  DIE_NO_IMPLEMENTATION
+  hContext->incrementReferenceCount();
+  return UR_RESULT_SUCCESS;
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urContextRelease(ur_context_handle_t hContext) {
-  hContext->decrementReferenceCount();
-  if(hContext->getReferenceCount() == 0)
-    delete hContext;
+  decrementOrDelete(hContext);
   return UR_RESULT_SUCCESS;
 }
 

source/adapters/native_cpu/kernel.cpp

@@ -182,9 +182,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelRetain(ur_kernel_handle_t hKernel) {
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urKernelRelease(ur_kernel_handle_t hKernel) {
-  hKernel->decrementReferenceCount();
-  if(hKernel->getReferenceCount() == 0)
-    delete hKernel;
+  decrementOrDelete(hKernel);
 
   return UR_RESULT_SUCCESS;
 }

source/adapters/native_cpu/program.cpp

@@ -95,10 +95,7 @@ urProgramRetain(ur_program_handle_t hProgram) {
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramRelease(ur_program_handle_t hProgram) {
-  hProgram->decrementReferenceCount();
-  if(hProgram->getReferenceCount() == 0)
-    delete hProgram;
-
+  decrementOrDelete(hProgram);
   return UR_RESULT_SUCCESS;
 }
 

source/adapters/native_cpu/queue.cpp

@@ -49,9 +49,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueRetain(ur_queue_handle_t hQueue) {
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urQueueRelease(ur_queue_handle_t hQueue) {
-  hQueue->decrementReferenceCount();
-  if(hQueue->getReferenceCount() == 0)
-    delete hQueue;
+  decrementOrDelete(hQueue);
 
   return UR_RESULT_SUCCESS;
 }