disable proxy bla bla

Author: bratpiorka

.github/workflows/reusable_basic.yml

@@ -210,7 +210,7 @@ jobs:
         --build-type ${{matrix.build_type}}
         --disjoint-pool
         --jemalloc-pool
-        ${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && '--proxy' || '' }}
+        ${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
         --umf-version ${{env.UMF_VERSION}}
         ${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
 
@@ -300,7 +300,7 @@ jobs:
         --build-type ${{matrix.build_type}}
         --disjoint-pool
         --jemalloc-pool
-        --proxy
+        ${{matrix.shared_library == 'ON' && '--proxy' || '' }}
         --umf-version ${{env.UMF_VERSION}}
         ${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
         
@@ -310,7 +310,7 @@ jobs:
       shell: pwsh
 
     - name: check /DEPENDENTLOADFLAG in umf_proxy.dll
-      if: ${{matrix.compiler.cxx == 'cl'}}
+      if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
       run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/src/proxy_lib/${{matrix.build_type}}/umf_proxy.dll
       shell: pwsh
 

.github/workflows/reusable_fast.yml

@@ -136,7 +136,7 @@ jobs:
     # TODO: We could add some script to verify metadata of dll's (selected fields, perhaps)
     # ref. https://superuser.com/questions/381276/what-are-some-nice-command-line-ways-to-inspect-dll-exe-details
     - name: Print metadata of our dll's
-      if: matrix.os == 'windows-latest'
+      if: ${{matrix.shared_library == 'ON' && matrix.os == 'windows-latest' }}
       run: |
         get-command ${{github.workspace}}/build/bin/Release/umf.dll | format-list
         get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list

.github/workflows/reusable_sanitizers.yml

@@ -15,7 +15,9 @@ jobs:
     name: Ubuntu
     strategy:
       matrix:
-        compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}, {c: icx, cxx: icpx}]
+        compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++},
+        # {c: icx, cxx: icpx}
+        ]
         # TSAN is mutually exclusive with other sanitizers
         sanitizers: [{asan: ON, ubsan: ON, tsan: OFF}, {asan: OFF, ubsan: OFF, tsan: ON}]
     runs-on: ubuntu-22.04

src/provider/provider_tracking.c

@@ -699,3 +699,38 @@ umf_result_t umfTrackingMemoryProviderCreate(
     return umfMemoryProviderCreate(umfTrackingMemoryProviderOps(), &params,
                                    hTrackingProvider);
 }
+
+umf_result_t
+umfMemoryTrackerGetAllocInfoTracker(const void *ptr,
+                                    umf_memory_tracker_handle_t tracker,
+                                    umf_alloc_info_t *pAllocInfo) {
+    assert(ptr);
+    assert(pAllocInfo);
+
+    if (tracker == NULL) {
+        LOG_ERR("tracker is NULL");
+        return UMF_RESULT_ERROR_NOT_SUPPORTED;
+    }
+
+    if (tracker->map == NULL) {
+        LOG_ERR("tracker's map is not created");
+        return UMF_RESULT_ERROR_NOT_SUPPORTED;
+    }
+
+    uintptr_t rkey;
+    umf_tracker_value_t *rvalue;
+    int found = critnib_find(tracker->map, (uintptr_t)ptr, FIND_LE,
+                             (void *)&rkey, (void **)&rvalue);
+    if (!found || (uintptr_t)ptr >= rkey + rvalue->size) {
+        LOG_WARN("pointer %p not found in the tracker, tracker=%p", ptr,
+                 (void *)tracker);
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
+
+    pAllocInfo->base = (void *)rkey;
+    pAllocInfo->baseSize = rvalue->size;
+    // TODO proxy pool?
+    pAllocInfo->pool = rvalue->pool;
+
+    return UMF_RESULT_SUCCESS;
+}

src/tracker.c

@@ -156,41 +156,6 @@ void umfMemoryTrackerDestroy(umf_memory_tracker_handle_t handle) {
     umf_ba_global_free(handle);
 }
 
-umf_result_t
-umfMemoryTrackerGetAllocInfoTracker(const void *ptr,
-                                    umf_memory_tracker_handle_t tracker,
-                                    umf_alloc_info_t *pAllocInfo) {
-    assert(ptr);
-    assert(pAllocInfo);
-
-    if (tracker == NULL) {
-        LOG_ERR("tracker is NULL");
-        return UMF_RESULT_ERROR_NOT_SUPPORTED;
-    }
-
-    if (tracker->map == NULL) {
-        LOG_ERR("tracker's map is not created");
-        return UMF_RESULT_ERROR_NOT_SUPPORTED;
-    }
-
-    uintptr_t rkey;
-    umf_tracker_value_t *rvalue;
-    int found = critnib_find(tracker->map, (uintptr_t)ptr, FIND_LE,
-                             (void *)&rkey, (void **)&rvalue);
-    if (!found || (uintptr_t)ptr >= rkey + rvalue->size) {
-        LOG_WARN("pointer %p not found in the tracker, tracker=%p", ptr,
-                 (void *)tracker);
-        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
-    }
-
-    pAllocInfo->base = (void *)rkey;
-    pAllocInfo->baseSize = rvalue->size;
-    // TODO proxy pool?
-    pAllocInfo->pool = rvalue->pool;
-
-    return UMF_RESULT_SUCCESS;
-}
-
 #ifdef __cplusplus
 }
 #endif