--- libaitsched/inc/aitsched.h 2026/05/20 03:37:12 1.35.2.2 +++ libaitsched/inc/aitsched.h 2026/11/12 12:03:38 1.36.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.35.2.2 2026/05/20 03:37:12 misho Exp $ +* $Id: aitsched.h,v 1.36.2.1 2026/11/12 12:03:38 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -66,12 +66,6 @@ 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 #define CRITERIA_CALL 1 @@ -83,7 +77,35 @@ SUCH DAMAGE. #define CRITERIA_DATLEN 7 #define CRITERIA_ID 8 +/* aitsched fd_set */ +#define SCHED_FD_SETSIZE 32768 +#define SCHED_NFDBITS (8 * (int) sizeof (long)) +#define SCHED_FD_ELT(d) ((d) / SCHED_NFDBITS) +#define SCHED_FD_MASK(d) ((long) (1UL << ((d) % SCHED_NFDBITS))) +typedef struct { +#ifdef __USE_XOPEN + long fds_bits[SCHED_FD_SETSIZE / SCHED_NFDBITS]; +#define SCHED_FDS_BITS(set) ((set)->fds_bits) +#else + long __fds_bits[SCHED_FD_SETSIZE / SCHED_NFDBITS]; +#define SCHED_FDS_BITS(set) ((set)->__fds_bits) +#endif +} sched_fd_set; +#define SCHED_FD_ZERO(set) \ + do { \ + unsigned int __i; \ + sched_fd_set *__arr = (set); \ + for (__i = 0; __i < sizeof(sched_fd_set) / sizeof(long); ++__i) \ + SCHED_FDS_BITS(__arr)[__i] = 0; \ + } while (0) +#define SCHED_FD_SET(d, set) \ + ((void) (SCHED_FDS_BITS(set)[SCHED_FD_ELT(d)] |= SCHED_FD_MASK(d))) +#define SCHED_FD_CLR(d, set) \ + ((void) (SCHED_FDS_BITS(set)[SCHED_FD_ELT(d)] &= ~SCHED_FD_MASK(d))) +#define SCHED_FD_ISSET(d, set) \ + ((SCHED_FDS_BITS(set)[SCHED_FD_ELT(d)] & SCHED_FD_MASK(d)) != 0) + /* early declaration for root & task */ typedef struct sched_Task sched_task_t; typedef struct sched_RootTask sched_root_task_t; @@ -179,9 +201,9 @@ typedef void *(*sched_task_func_t)(sched_task_t * /* c /* task lock helpers */ #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) + #define TASK_LOCK(x) atomic_store_explicit(&(x)->task_lock, 42, memory_order_release) + #define TASK_UNLOCK(x) atomic_store_explicit(&(x)->task_lock, 0, memory_order_release) + #define TASK_ISLOCKED(x) atomic_load_explicit(&(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) @@ -195,7 +217,7 @@ struct sched_Task { sched_task_type_t task_type; #define TASK_TYPE(x) (x)->task_type #ifdef ATOMIC_SUPPORT - E_ATOMIC_ALIGN int task_lock; + atomic_int task_lock; #else volatile int task_lock; #endif @@ -243,7 +265,7 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; - fd_set root_fds[3]; + sched_fd_set root_fds[3]; struct timespec root_wait; struct timespec root_poll; unsigned long root_miss;