--- libaitsched/inc/defs.h	2012/01/24 21:59:46	1.4
+++ libaitsched/inc/defs.h	2014/02/01 14:09:25	1.12.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.4 2012/01/24 21:59:46 misho Exp $
+* $Id: defs.h,v 1.12.4.1 2014/02/01 14:09:25 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
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,10 +47,24 @@ SUCH DAMAGE.
 #define __DEFS_H
 
 
+#ifndef STRSIZ
 #define STRSIZ			256
-#define KQ_EVENTS		24
-#define MAX_EVENTLO_MISS	48
+#endif
 
+#ifndef KQ_EVENTS
+#define KQ_EVENTS		32
+#endif
+
+#ifndef EV_EOF
+#define EV_EOF			0x8000
+#endif
+
+#ifndef SIGRTMIN
+#define SIGRTMIN		65
+#endif
+
+#define MAX_TASK_MISS		12
+
 #define LOGERR	{ \
 			sched_Errno = errno; \
 			strlcpy(sched_Error, strerror(errno), STRSIZ); \
@@ -84,13 +98,47 @@ SUCH DAMAGE.
 		}							\
 	} while (0)
 
+#define sched_timespec2val(tsp, tvp)	((tvp)->tv_sec = (tsp)->tv_sec, \
+						(tvp)->tv_usec = (tsp)->tv_nsec / 1000)
+#define sched_timeval2spec(tvp, tsp)	((tsp)->tv_sec = (tvp)->tv_sec, \
+						(tsp)->tv_nsec = (tvp)->tv_usec * 1000)
+
+#define sched_timevalclear(tvp)	((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#define sched_timevalinf(tvp)	((tvp)->tv_sec = (tvp)->tv_usec = -1)
+#define sched_timevalisinf(tvp)	((tvp)->tv_sec == -1 && (tvp)->tv_usec == -1)
+#define sched_timevalisset(tvp)	(((tvp)->tv_sec && (tvp)->tv_sec != -1) || \
+						((tvp)->tv_usec && (tvp)->tv_usec != -1))
+#define sched_timevalcmp(tvp, uvp, cmp)				\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+		((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
+		((tvp)->tv_sec cmp (uvp)->tv_sec))
+#define sched_timevaladd(tvp, uvp, vvp)				\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#define sched_timevalsub(tvp, uvp, vvp)				\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+
+
 extern int sched_Errno;
 extern char sched_Error[];
 
-inline void sched_SetErr(int, char *, ...);
+void sched_SetErr(int, char *, ...);
 
-inline sched_task_t *_sched_useTask(sched_root_task_t * __restrict root);
-inline sched_task_t *_sched_unuseTask(sched_task_t * __restrict task);
+void *_sched_threadWrapper(sched_task_t *);
+void *_sched_rtcWrapper(sched_task_t *);
 
 
 #endif