--- libaitsched/inc/aitsched.h 2015/07/02 22:45:00 1.28 +++ libaitsched/inc/aitsched.h 2023/02/25 15:55:01 1.32 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.28 2015/07/02 22:45:00 misho Exp $ +* $Id: aitsched.h,v 1.32 2023/02/25 15:55:01 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 - 2015 +Copyright 2004 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -202,6 +202,9 @@ struct sched_Task { #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; @@ -215,12 +218,18 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; - fd_set root_fds[2]; + fd_set root_fds[3]; struct timespec root_wait; struct timespec root_poll; 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]; @@ -369,13 +378,35 @@ int schedQuery(sched_task_t * __restrict task); * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ] * @param = search parameter - * return: -1 error, 0 found or 1 not found + * return: NULL not found or !=NULL task */ -int schedQueryby(sched_root_task_t * __restrict root, sched_task_type_t type, +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 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 @@ -388,9 +419,23 @@ int schedQueryby(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 @@ -403,8 +448,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 * @@ -449,6 +494,21 @@ sched_task_t *schedRTC(sched_root_task_t * __restrict sched_task_t *schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *opt_data, size_t opt_dlen); #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