Update entry points names

Signed-off-by: pavelkumbrasev <[email protected]>
uxlfoundation · Feb 13, 2024 · d8b5874 · d8b5874
1 parent 131cf5d
commit d8b5874
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/include/oneapi/tbb/task_group.h b/include/oneapi/tbb/task_group.h
@@ -71,7 +71,7 @@ TBB_EXPORT void __TBB_EXPORTED_FUNC capture_fp_settings(d1::task_group_context&)
 
 TBB_EXPORT void __TBB_EXPORTED_FUNC set_top_group_task(d1::task*);
 TBB_EXPORT d1::task* __TBB_EXPORTED_FUNC get_top_group_task();
-TBB_EXPORT void __TBB_EXPORTED_FUNC remove_top_group_task();
+TBB_EXPORT void __TBB_EXPORTED_FUNC unset_top_group_task();
 
 struct task_group_context_impl;
 }
@@ -532,7 +532,7 @@ class function_task : public base_task_group_task {
                 r1::set_top_group_task(t);
             }
             ~top_task_guard_type() {
-                r1::remove_top_group_task();
+                r1::unset_top_group_task();
             }
         } top_task_guard{this};
 

diff --git a/src/tbb/def/lin32-tbb.def b/src/tbb/def/lin32-tbb.def
@@ -98,7 +98,7 @@ _ZN3tbb6detail2r119capture_fp_settingsERNS0_2d118task_group_contextE;
 /* Task group (task_group_context.cpp) */
 _ZN3tbb6detail2r118set_top_group_taskEPNS0_2d14taskE;
 _ZN3tbb6detail2r118get_top_group_taskEv;
-_ZN3tbb6detail2r121remove_top_group_taskEv;
+_ZN3tbb6detail2r121unset_top_group_taskEv;
 
 /* Task arena (arena.cpp) */
 _ZN3tbb6detail2r115max_concurrencyEPKNS0_2d115task_arena_baseE;

diff --git a/src/tbb/def/lin64-tbb.def b/src/tbb/def/lin64-tbb.def
@@ -98,7 +98,7 @@ _ZN3tbb6detail2r119capture_fp_settingsERNS0_2d118task_group_contextE;
 /* Task group (task_group_context.cpp) */
 _ZN3tbb6detail2r118set_top_group_taskEPNS0_2d14taskE;
 _ZN3tbb6detail2r118get_top_group_taskEv;
-_ZN3tbb6detail2r121remove_top_group_taskEv;
+_ZN3tbb6detail2r121unset_top_group_taskEv;
 
 /* Task arena (arena.cpp) */
 _ZN3tbb6detail2r115max_concurrencyEPKNS0_2d115task_arena_baseE;

diff --git a/src/tbb/def/mac64-tbb.def b/src/tbb/def/mac64-tbb.def
@@ -100,7 +100,7 @@ __ZN3tbb6detail2r119capture_fp_settingsERNS0_2d118task_group_contextE
 # Task group (task_group_context.cpp)
 __ZN3tbb6detail2r118set_top_group_taskEPNS0_2d14taskE
 __ZN3tbb6detail2r118get_top_group_taskEv
-__ZN3tbb6detail2r121remove_top_group_taskEv
+__ZN3tbb6detail2r121unset_top_group_taskEv
 
 # Task arena (arena.cpp)
 __ZN3tbb6detail2r115max_concurrencyEPKNS0_2d115task_arena_baseE

diff --git a/src/tbb/def/win32-tbb.def b/src/tbb/def/win32-tbb.def
@@ -92,7 +92,7 @@ EXPORTS
 ; Task group (task_group_context.cpp)
 ?set_top_group_task@r1@detail@tbb@@YAXPAVtask@d1@23@@Z
 ?get_top_group_task@r1@detail@tbb@@YAPAVtask@d1@23@XZ
-?remove_top_group_task@r1@detail@tbb@@YAXXZ
+?unset_top_group_task@r1@detail@tbb@@YAXXZ
 
 ; Task arena (arena.cpp)
 ?attach@r1@detail@tbb@@YA_NAAVtask_arena_base@d1@23@@Z

diff --git a/src/tbb/def/win64-tbb.def b/src/tbb/def/win64-tbb.def
@@ -92,7 +92,7 @@ EXPORTS
 ; Task group (task_group_context.cpp)
 ?set_top_group_task@r1@detail@tbb@@YAXPEAVtask@d1@23@@Z
 ?get_top_group_task@r1@detail@tbb@@YAPEAVtask@d1@23@XZ
-?remove_top_group_task@r1@detail@tbb@@YAXXZ
+?unset_top_group_task@r1@detail@tbb@@YAXXZ
 
 ; Task arena (arena.cpp)
 ?max_concurrency@r1@detail@tbb@@YAHPEBVtask_arena_base@d1@23@@Z

diff --git a/src/tbb/task_group_context.cpp b/src/tbb/task_group_context.cpp
@@ -345,8 +345,8 @@ d1::task* __TBB_EXPORTED_FUNC get_top_group_task() {
     return governor::get_thread_data()->get_top_group_task();
 }
 
-void __TBB_EXPORTED_FUNC remove_top_group_task() {
-    governor::get_thread_data()->remove_top_group_task();
+void __TBB_EXPORTED_FUNC unset_top_group_task() {
+    governor::get_thread_data()->unset_top_group_task();
 }
 
 //------------------------------------------------------------------------

diff --git a/src/tbb/thread_data.h b/src/tbb/thread_data.h
@@ -263,7 +263,7 @@ inline d1::task* thread_data::get_top_group_task() {
     return my_task_dispatcher->my_task_group_tasks.empty() ? nullptr : my_task_dispatcher->my_task_group_tasks.top();
 }
 
-inline void thread_data::remove_top_group_task() {
+inline void thread_data::unset_top_group_task() {
     __TBB_ASSERT(!my_task_dispatcher->my_task_group_tasks.empty(), nullptr);
     my_task_dispatcher->my_task_group_tasks.pop();
 }