--- libaitsched/inc/aitsched.h 2013/08/15 18:39:00 1.19.2.3 +++ libaitsched/inc/aitsched.h 2025/07/16 11:07:06 1.34 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.19.2.3 2013/08/15 18:39:00 misho Exp $ +* $Id: aitsched.h,v 1.34 2025/07/16 11:07:06 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ SUCH DAMAGE. #include #include -#include +#include #include #include #include @@ -67,7 +67,8 @@ SUCH DAMAGE. #define CRITERIA_VAL 4 #define CRITERIA_TS 5 #define CRITERIA_DATA 6 -#define CRITERIA_ID 7 +#define CRITERIA_DATLEN 7 +#define CRITERIA_ID 8 /* early declaration for root & task */ @@ -159,6 +160,7 @@ typedef struct sched_HooksTask hooks_task_t; /* task callback, like pthread callback! */ typedef void *(*sched_task_func_t)(sched_task_t * /* current task data*/); +#define SCHED_TASK_DEFINE(x) void *(x)(sched_task_t*) /* task lock helpers */ #define TASK_LOCK(x) ((x)->task_lock = 42) @@ -193,10 +195,16 @@ struct sched_Task { #define TASK_FD(x) (x)->task_val.fd #define TASK_TS(x) (x)->task_val.ts +#define TASK_TS2TV(x, tvp) (assert((tvp)), (tvp)->tv_sec = (x)->task_val.ts.tv_sec, \ + (tvp)->tv_usec = (x)->task_val.ts.tv_nsec / 1000) + struct iovec task_data; #define TASK_DATA(x) (x)->task_data.iov_base #define TASK_DATLEN(x) (x)->task_data.iov_len + unsigned long task_harg; +#define TASK_HARG(x) (x)->task_harg + TAILQ_ENTRY(sched_Task) task_node; }; typedef TAILQ_HEAD(, sched_Task) sched_queue_t; @@ -210,11 +218,18 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; - unsigned long root_miss; + fd_set root_fds[3]; struct timespec root_wait; struct timespec root_poll; - intptr_t root_cond; + unsigned long root_miss; + 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]; @@ -244,6 +259,9 @@ struct sched_RootTask { #define ROOT_QUEUE_EMPTY(x, _q) TAILQ_EMPTY(&((x)->root_##_q)) #define ROOT_RETURN(x) (x)->root_ret +#ifdef __cplusplus +extern "C" { +#endif int sched_GetErrno(); const char *sched_GetError(); @@ -303,7 +321,7 @@ int schedPolling(sched_root_task_t * __restrict root, * @condValue = condition value, kill schedRun() if condValue == killState * return: -1 error or 0 ok */ -int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue); +int schedTermCondition(sched_root_task_t * __restrict root, intptr_t * __restrict condValue); /* * schedCall() - Call task execution function * @@ -339,16 +357,59 @@ int schedCancel(sched_task_t * __restrict task); * @root = root task * @type = cancel from queue type, if =taskMAX cancel same task from all queues * @criteria = find task by criteria - * [CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA] + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ] * @param = search parameter * @hook = custom cleanup hook function, may be NULL * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok */ int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, - u_char criteria, void *param, sched_hook_func_t hook); + unsigned char criteria, void *param, sched_hook_func_t hook); +/* + * schedQuery() - Query task in scheduler + * + * @task = task + * return: -1 error, 0 found and 1 not found + */ +int schedQuery(sched_task_t * __restrict task); +/* + * schedQueryby() - Query task in scheduler by criteria + * + * @root = root task + * @type = query from queue type, if =taskMAX query same task from all queues + * @criteria = find task by criteria + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ] + * @param = search parameter + * return: NULL not found or !=NULL task + */ +sched_task_t *schedQueryby(sched_root_task_t * __restrict root, sched_task_type_t type, + unsigned char criteria, void *param); +/* + * schedSignalDispatch() - Activate or Deactivate signal dispatcher + * + * @root = root task + * @on = Activate or =0 deactivate + * return: -1 error, 1 already started, 2 another thread already started or 0 ok + */ +int schedSignalDispatch(sched_root_task_t * __restrict root, int on); /* + * schedReadExt() - Add READ I/O task to scheduler queue with custom event mask + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = fd handle + * @opt_data = Optional data + * @opt_dlen = Optional data length + * @mask = Event mask + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedReadExt(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int fd, void *opt_data, size_t opt_dlen, unsigned long mask); +/* * schedRead() - Add READ I/O task to scheduler queue * * @root = root task @@ -361,9 +422,23 @@ int schedCancelby(sched_root_task_t * __restrict root, */ sched_task_t *schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *opt_data, size_t opt_dlen); -#define schedReadSelf(x) schedRead(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ - TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x))) +#define schedReadSelf(x) schedReadExt(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x)), TASK_HARG((x))) /* + * schedWriteExt() - Add WRITE I/O task to scheduler queue with custom event mask + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = fd handle + * @opt_data = Optional data + * @opt_dlen = Optional data length + * @mask = Event mask + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedWriteExt(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int fd, void *opt_data, size_t opt_dlen, unsigned long mask); +/* * schedWrite() - Add WRITE I/O task to scheduler queue * * @root = root task @@ -376,8 +451,8 @@ sched_task_t *schedRead(sched_root_task_t * __restrict */ sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *opt_data, size_t opt_dlen); -#define schedWriteSelf(x) schedWrite(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ - TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x))) +#define schedWriteSelf(x) schedWriteExt(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x)), TASK_HARG((x))) /* * schedAlarm() - Add ALARM task to scheduler queue * @@ -400,7 +475,7 @@ sched_task_t *schedAlarm(sched_root_task_t * __restric * @func = task execution function * @arg = 1st func argument * @ts = timeout argument structure, minimum alarm timer resolution is 1msec! - * @opt_data = RTC ID + * @opt_data = Optional RTC ID * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ @@ -424,6 +499,21 @@ sched_task_t *schedNode(sched_root_task_t * __restrict #define schedNodeSelf(x) schedNode(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x))) /* + * schedNode2() - Add NODE task with all events to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = fd handle + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedNode2(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int fd, void *opt_data, size_t opt_dlen); +#define schedNode2Self(x) schedNode2(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x))) +/* * schedProc() - Add PROC task to scheduler queue * * @root = root task @@ -626,8 +716,8 @@ sched_task_t *schedSuspend(sched_root_task_t * __restr * * @root = root task * @criteria = find task by criteria - * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA] - * @param = search parameter (sched_task_t *task| u_long id) + * [ CRITERIA_ANY|CRITERIA_ID|CRITERIA_VAL|CRITERIA_DATA ] + * @param = search parameter (sched_task_t *task| unsigned long id) * return: -1 error or 0 resumed ok */ int schedResumeby(sched_root_task_t * __restrict root, unsigned char criteria, void *param); @@ -654,16 +744,15 @@ sched_task_t *schedCallOnce(sched_root_task_t * __rest * @root = root task * @func = task execution function * @arg = 1st func argument - * @detach = Detach thread from scheduler, if !=0 * @ss = stack size * @opt_data = Optional data * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ sched_task_t *schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, - int detach, size_t ss, void *opt_data, size_t opt_dlen); + size_t ss, void *opt_data, size_t opt_dlen); #define schedThreadSelf(x) schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ - (TASK_FLAG((x)) & 0x1), (size_t) (TASK_FLAG((x)) >> 1), TASK_DATA((x)), TASK_DATLEN((x))) + (size_t) TASK_FLAG((x)), TASK_DATA((x)), TASK_DATLEN((x))) /* * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks * @@ -681,5 +770,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