--- libaitsched/inc/aitsched.h	2026/05/20 03:07:51	1.35.2.1
+++ libaitsched/inc/aitsched.h	2026/05/20 03:37:12	1.35.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.35.2.1 2026/05/20 03:07:51 misho Exp $
+* $Id: aitsched.h,v 1.35.2.2 2026/05/20 03:37:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -66,6 +66,11 @@ SUCH DAMAGE.
 #endif
 #endif
 
+#ifdef ATOMIC_SUPPORT
+#ifndef E_ATOMIC_ALIGN
+	#define E_ATOMIC_ALIGN	alignas(sizeof(int) * 8)
+#endif
+#endif
 
 /* criteria type */
 #define CRITERIA_ANY	0
@@ -173,9 +178,15 @@ typedef void *(*sched_task_func_t)(sched_task_t * /* c
 #define SCHED_TASK_DEFINE(x)	void *(x)(sched_task_t*)
 
 /* task lock helpers */
-#define TASK_LOCK(x)		((x)->task_lock = 42)
-#define TASK_UNLOCK(x)		((x)->task_lock ^= (x)->task_lock)
-#define TASK_ISLOCKED(x)	((x)->task_lock)
+#ifdef ATOMIC_SUPPORT
+	#define TASK_LOCK(x)		atomic_store_explicit((atomic_int*) &(x)->task_lock, 42, memory_order_release)
+	#define TASK_UNLOCK(x)		atomic_store_explicit((atomic_int*) &(x)->task_lock, 0, memory_order_release)
+	#define TASK_ISLOCKED(x)	atomic_load_explicit((atomic_int*) &(x)->task_lock, memory_order_acquire)
+#else
+	#define TASK_LOCK(x)		((x)->task_lock = 42)
+	#define TASK_UNLOCK(x)		((x)->task_lock ^= (x)->task_lock)
+	#define TASK_ISLOCKED(x)	((x)->task_lock)
+#endif
 
 /* task & queue */
 struct sched_Task {
@@ -183,7 +194,11 @@ struct sched_Task {
 #define TASK_ID(x)	((struct sched_Task*) (x)->task_id)
 	sched_task_type_t		task_type;
 #define TASK_TYPE(x)	(x)->task_type
+#ifdef ATOMIC_SUPPORT
+	E_ATOMIC_ALIGN int		task_lock;
+#else
 	volatile int			task_lock;
+#endif
 
 	sched_root_task_t		*task_root;
 #define TASK_ROOT(x)	(x)->task_root