From 1f065df77b052b69b6d57a1e038448f098f3bb20 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 21 Jul 2022 10:34:28 +0200
Subject: [PATCH] main: use new re_atomic helpers
---
src/main/main.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/main.c b/src/main/main.c
index c7b88a987..0ca636479 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -1063,7 +1063,7 @@ int re_main(re_signal_h *signalh)
}
#endif
- if (re_atomic_load(&re->polling, re_memory_order_relaxed)) {
+ if (re_atomic_weak(&re->polling)) {
DEBUG_WARNING("main loop already polling\n");
return EALREADY;
}
@@ -1075,7 +1075,7 @@ int re_main(re_signal_h *signalh)
DEBUG_INFO("Using async I/O polling method: `%s'\n",
poll_method_name(re->method));
- re_atomic_store(&re->polling, true, re_memory_order_relaxed);
+ re_atomic_weak_set(&re->polling, true);
re_lock(re);
for (;;) {
@@ -1087,7 +1087,7 @@ int re_main(re_signal_h *signalh)
re->sig = 0;
}
- if (!re_atomic_load(&re->polling, re_memory_order_relaxed)) {
+ if (!re_atomic_weak(&re->polling)) {
err = 0;
break;
}
@@ -1118,7 +1118,7 @@ int re_main(re_signal_h *signalh)
re_unlock(re);
out:
- re_atomic_store(&re->polling, false, re_memory_order_relaxed);
+ re_atomic_weak_set(&re->polling, false);
return err;
}
@@ -1136,7 +1136,7 @@ void re_cancel(void)
return;
}
- re_atomic_store(&re->polling, false, re_memory_order_relaxed);
+ re_atomic_weak_set(&re->polling, false);
}
@@ -1332,8 +1332,7 @@ void re_thread_enter(void)
/* set only for non-re threads */
if (!thrd_equal(re->tid, thrd_current())) {
- re_atomic_store(&re->thread_enter, true,
- re_memory_order_relaxed);
+ re_atomic_weak_set(&re->thread_enter, true);
}
}
@@ -1350,7 +1349,7 @@ void re_thread_leave(void)
return;
}
- re_atomic_store(&re->thread_enter, false, re_memory_order_relaxed);
+ re_atomic_weak_set(&re->thread_enter, false);
re_unlock(re);
}
@@ -1421,7 +1420,7 @@ int re_thread_check(void)
if (!re)
return EINVAL;
- if (re_atomic_load(&re->thread_enter, re_memory_order_relaxed))
+ if (re_atomic_weak(&re->thread_enter))
return 0;
if (thrd_equal(re->tid, thrd_current()))