--- libaitsched/inc/defs.h	2014/01/28 13:17:33	1.12
+++ libaitsched/inc/defs.h	2023/02/23 17:13:01	1.17.10.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.12 2014/01/28 13:17:33 misho Exp $
+* $Id: defs.h,v 1.17.10.1 2023/02/23 17:13: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 <info@elwix.org>
 
-Copyright 2004 - 2014
+Copyright 2004 - 2023
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,37 @@ SUCH DAMAGE.
 #define EV_EOF			0x8000
 #endif
 
+#ifndef SIGRTMIN
+#define SIGRTMIN		65
+#endif
+
+#ifndef FIONWRITE
+#define FIONWRITE		SIOCOUTQ
+#endif
+
+#ifndef TIMER_RELTIME
+#define TIMER_RELTIME		0
+#endif
+
+#ifndef EV_EOF
+#define EV_EOF			0x8000	/* EOF detected */
+#endif
+#ifndef EV_ERROR
+#define EV_ERROR		0x4000	/* error, data contains errno */
+#endif
+
+#ifndef __unused
+#define __unused		__attribute__((unused))
+#endif
+
+#ifndef __ELWIX
+#define e_malloc	malloc
+#define e_calloc	calloc
+#define e_realloc	realloc
+#define e_free		free
+#define e_strdup	strdup
+#endif
+
 #define MAX_TASK_MISS		12
 
 #define LOGERR	{ \
@@ -66,6 +97,15 @@ SUCH DAMAGE.
 			strlcpy(sched_Error, strerror(errno), STRSIZ); \
 		}
 
+#ifndef HAVE_LIBPTHREAD
+#define pthread_mutex_lock(x)
+#define pthread_mutex_unlock(x)
+#endif
+
+#define SCHED_QTRYLOCK(r, x)		pthread_mutex_trylock(&(r)->root_mtx[(x)])
+#define SCHED_QLOCK(r, x)		pthread_mutex_lock(&(r)->root_mtx[(x)])
+#define SCHED_QUNLOCK(r, x)		pthread_mutex_unlock(&(r)->root_mtx[(x)])
+
 #define sched_timespecclear(tsp)	((tsp)->tv_sec = (tsp)->tv_nsec = 0)
 #define sched_timespecinf(tsp)		((tsp)->tv_sec = (tsp)->tv_nsec = -1)
 #define sched_timespecisinf(tsp)	((tsp)->tv_sec == -1 && (tsp)->tv_nsec == -1)
@@ -128,13 +168,60 @@ SUCH DAMAGE.
 	} while (0)
 
 
+#ifndef HAVE_STRLCAT
+size_t strlcat(char * __restrict dst, const char * __restrict src, size_t siz);
+#endif
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz);
+#endif
+
+
 extern int sched_Errno;
 extern char sched_Error[];
 
 void sched_SetErr(int, char *, ...);
 
-void *_sched_threadWrapper(sched_task_t *);
-void *_sched_rtcWrapper(sched_task_t *);
+
+static inline void
+remove_task_from(sched_task_t * __restrict t, sched_queue_t * __restrict q)
+{
+	assert(t && q);
+
+	SCHED_QLOCK(TASK_ROOT(t), TASK_TYPE(t));
+	TAILQ_REMOVE(q, t, task_node);
+	SCHED_QUNLOCK(TASK_ROOT(t), TASK_TYPE(t));
+}
+
+static inline void
+insert_task_to(sched_task_t * __restrict t, sched_queue_t * __restrict q)
+{
+	assert(t && q);
+
+	SCHED_QLOCK(TASK_ROOT(t), TASK_TYPE(t));
+	TAILQ_INSERT_TAIL(q, t, task_node);
+	SCHED_QUNLOCK(TASK_ROOT(t), TASK_TYPE(t));
+}
+
+static inline void
+transit_task2unuse(sched_task_t * __restrict t, sched_queue_t * __restrict q)
+{
+	assert(t && q);
+
+	remove_task_from(t, q);
+
+	TASK_UNLOCK(t);
+	TASK_TYPE(t) = taskUNUSE;
+	insert_task_to(t, &(TASK_ROOT(t))->root_unuse);
+}
+
+static inline void
+transit_task2ready(sched_task_t * __restrict t, sched_queue_t * __restrict q)
+{
+	remove_task_from(t, q);
+
+	t->task_type = taskREADY;
+	insert_task_to(t, &(TASK_ROOT(t))->root_ready);
+}
 
 
 #endif