--- libaitsched/inc/aitsched.h	2013/11/21 14:39:10	1.24
+++ libaitsched/inc/aitsched.h	2022/11/28 23:30:41	1.29.10.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.24 2013/11/21 14:39:10 misho Exp $
+* $Id: aitsched.h,v 1.29.10.3 2022/11/28 23:30:41 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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ SUCH DAMAGE.
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/event.h>
+#include <sys/select.h>
 #include <sys/uio.h>
 #include <stdint.h>
 #include <pthread.h>
@@ -160,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)
@@ -194,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
 
+	void				*task_harg;
+#define TASK_HARG(x)	(x)->task_harg
+
 	TAILQ_ENTRY(sched_Task)		task_node;
 };
 typedef TAILQ_HEAD(, sched_Task) sched_queue_t;
@@ -211,10 +218,11 @@ 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;
 
 	pthread_mutex_t	root_mtx[taskMAX];
@@ -304,7 +312,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
  *
@@ -371,6 +379,20 @@ int schedQueryby(sched_root_task_t * __restrict root, 
 
 
 /*
+ * 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
@@ -383,8 +405,8 @@ 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)))
 /*
  * schedWrite() - Add WRITE I/O task to scheduler queue
  *
@@ -444,6 +466,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