--- libaitsched/inc/aitsched.h 2023/02/23 17:13:01 1.31.2.2 +++ libaitsched/inc/aitsched.h 2026/05/20 04:04:10 1.35.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.31.2.2 2023/02/23 17:13:01 misho Exp $ +* $Id: aitsched.h,v 1.35.2.3 2026/05/20 04:04:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2023 +Copyright 2004 - 2026 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -57,8 +57,15 @@ SUCH DAMAGE. #ifdef EVFILT_LIO #include #endif +#ifdef ATOMIC_SUPPORT +#ifndef __cplusplus + #include +#else + #include + #define _Atomic(X) std::atomic +#endif +#endif - /* criteria type */ #define CRITERIA_ANY 0 #define CRITERIA_CALL 1 @@ -146,6 +153,8 @@ struct sched_HooksTask { sched_hook_func_t exception; /* condition(sched_root_task_t *root, intptr_t *stopValue) -> int */ sched_hook_func_t condition; + /* profile(sched_task_t *root, intptr_t *stageValue) -> int */ + sched_hook_func_t profile; } hook_exec; struct { /* init(sched_root_task_t *root, void *data) -> int */ @@ -163,9 +172,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(&(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) + #define TASK_ISLOCKED(x) ((x)->task_lock) +#endif /* task & queue */ struct sched_Task { @@ -173,7 +188,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 + atomic_int task_lock; +#else volatile int task_lock; +#endif sched_root_task_t *task_root; #define TASK_ROOT(x) (x)->task_root @@ -225,8 +244,10 @@ struct sched_RootTask { intptr_t root_cond[1]; void *root_ret; #ifdef HAVE_LIBPTHREAD + pthread_mutex_t root_sigmtx; pthread_t root_sigthr; sigset_t root_sigset; + sigset_t root_oldset; #endif pthread_mutex_t root_mtx[taskMAX]; @@ -256,7 +277,11 @@ struct sched_RootTask { }; #define ROOT_QUEUE_EMPTY(x, _q) TAILQ_EMPTY(&((x)->root_##_q)) #define ROOT_RETURN(x) (x)->root_ret +#define ROOT_PROFILING(x, _cb) (x)->root_hooks.hook_exec.profile = (_cb) +#ifdef __cplusplus +extern "C" { +#endif int sched_GetErrno(); const char *sched_GetError(); @@ -385,7 +410,7 @@ sched_task_t *schedQueryby(sched_root_task_t * __restr * * @root = root task * @on = Activate or =0 deactivate - * return: -1 error or 0 ok + * return: -1 error, 1 already started, 2 another thread already started or 0 ok */ int schedSignalDispatch(sched_root_task_t * __restrict root, int on); @@ -765,5 +790,8 @@ void *sched_taskExit(sched_task_t *task, intptr_t retc */ #define taskExit(t, x) return sched_taskExit((t), (intptr_t) (x)) +#ifdef __cplusplus +} +#endif #endif