test: Use _MCF_atomic_*

lhmouse · lhmouse · commit 3f4297004b12 · 2024-11-04T09:37:41.000+08:00
(cherry picked from commit 3f0d277) Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/test/c11_tss_deleted_key.c b/test/c11_tss_deleted_key.c
@@ -23,7 +23,7 @@ tls_destructor(void* ptr)
   {
     (void) ptr;
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add(&count, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(&count, 1);
   }
 
 static
diff --git a/test/c11_tss_dtor.c b/test/c11_tss_dtor.c
@@ -21,7 +21,7 @@ void
 tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static
diff --git a/test/gthr_tls_deleted_key.c b/test/gthr_tls_deleted_key.c
@@ -23,7 +23,7 @@ tls_destructor(void* ptr)
   {
     (void) ptr;
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add(&count, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(&count, 1);
   }
 
 static
diff --git a/test/gthr_tls_dtor.c b/test/gthr_tls_dtor.c
@@ -21,7 +21,7 @@ void
 tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static
diff --git a/test/libcxx_tls_deleted_key.c b/test/libcxx_tls_deleted_key.c
@@ -23,7 +23,7 @@ tls_destructor(void* ptr)
   {
     (void) ptr;
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add(&count, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(&count, 1);
   }
 
 static
diff --git a/test/libcxx_tls_dtor.c b/test/libcxx_tls_dtor.c
@@ -21,7 +21,7 @@ void
 tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static
diff --git a/test/once_abort.c b/test/once_abort.c
@@ -35,14 +35,14 @@ thread_proc(_MCF_thread* self)
       _MCF_once_abort(&once);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_init, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_init, 1);
     }
     else if(r == 0) {
       /* Assume `resource` has been initialized.  */
       assert(resource == 1);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_ready, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_ready, 1);
     }
     else
       assert(0);
diff --git a/test/once_release.c b/test/once_release.c
@@ -35,14 +35,14 @@ thread_proc(_MCF_thread* self)
       _MCF_once_release(&once);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_init, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_init, 1);
     }
     else if(r == 0) {
       /* Assume `resource` has been initialized.  */
       assert(resource == 1);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_ready, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_ready, 1);
     }
     else
       assert(0);
diff --git a/test/once_zero_timeout.c b/test/once_zero_timeout.c
@@ -36,18 +36,18 @@ thread_proc(_MCF_thread* self)
       _MCF_once_release(&once);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_init, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_init, 1);
     }
     else if(r == 0) {
       /* Assume `resource` has been initialized.  */
       assert(resource == 1);
 
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_ready, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_ready, 1);
     }
     else if(r == -1) {
       _MCF_sleep((const int64_t[]) { -100 });
-      __atomic_fetch_add(&num_timed_out, 1, __ATOMIC_RELAXED);
+      _MCF_atomic_xadd_32_rlx(&num_timed_out, 1);
     }
     else
       assert(0);
diff --git a/test/tls_deleted_key.c b/test/tls_deleted_key.c
@@ -23,7 +23,7 @@ tls_destructor(void* ptr)
   {
     (void) ptr;
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add(&count, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(&count, 1);
   }
 
 static
diff --git a/test/tls_dtor.c b/test/tls_dtor.c
@@ -22,7 +22,7 @@ tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
     assert(_MCF_tls_get(key) == __MCF_nullptr);
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static
diff --git a/test/tls_dtor.cpp b/test/tls_dtor.cpp
@@ -24,7 +24,7 @@ void
 tls_destructor(int* ptr)
   {
     ::fprintf(stderr, "thread %d tls_destructor\n", (int) ::_MCF_thread_self_tid());
-    __atomic_fetch_add(ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static NS::thread_specific_ptr<int> tss_ptr(tls_destructor);
diff --git a/test/tls_dtor_static.c b/test/tls_dtor_static.c
@@ -21,7 +21,7 @@ void
 tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static
diff --git a/test/tls_foreign_dtor.c b/test/tls_foreign_dtor.c
@@ -22,7 +22,7 @@ void
 tls_destructor(void* ptr)
   {
     fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());
-    __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);
+    _MCF_atomic_xadd_32_rlx(ptr, 1);
   }
 
 static __attribute__((__stdcall__))

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ tls_destructor(void* ptr)`
`23`	`23`	`{`
`24`	`24`	`(void) ptr;`
`25`	`25`	`fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());`
`26`		`- __atomic_fetch_add(&count, 1, __ATOMIC_RELAXED);`
	`26`	`+ _MCF_atomic_xadd_32_rlx(&count, 1);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`static`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ void`
`21`	`21`	`tls_destructor(void* ptr)`
`22`	`22`	`{`
`23`	`23`	`fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());`
`24`		`- __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);`
	`24`	`+ _MCF_atomic_xadd_32_rlx(ptr, 1);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ tls_destructor(void* ptr)`
`22`	`22`	`{`
`23`	`23`	`fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());`
`24`	`24`	`assert(_MCF_tls_get(key) == __MCF_nullptr);`
`25`		`- __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);`
	`25`	`+ _MCF_atomic_xadd_32_rlx(ptr, 1);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`static`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void`
`24`	`24`	`tls_destructor(int* ptr)`
`25`	`25`	`{`
`26`	`26`	`::fprintf(stderr, "thread %d tls_destructor\n", (int) ::_MCF_thread_self_tid());`
`27`		`- __atomic_fetch_add(ptr, 1, __ATOMIC_RELAXED);`
	`27`	`+ _MCF_atomic_xadd_32_rlx(ptr, 1);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`static NS::thread_specific_ptr<int> tss_ptr(tls_destructor);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void`
`22`	`22`	`tls_destructor(void* ptr)`
`23`	`23`	`{`
`24`	`24`	`fprintf(stderr, "thread %d tls_destructor\n", (int) _MCF_thread_self_tid());`
`25`		`- __atomic_fetch_add((int*) ptr, 1, __ATOMIC_RELAXED);`
	`25`	`+ _MCF_atomic_xadd_32_rlx(ptr, 1);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`static __attribute__((__stdcall__))`