--- libaitsched/example/test_time.c	2012/05/31 14:45:10	1.3.2.1
+++ libaitsched/example/test_time.c	2012/05/31 21:56:27	1.3.2.4
@@ -2,7 +2,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/types.h>
+#include <sys/event.h>
 #include <sys/stat.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
@@ -24,7 +26,7 @@ void *eventlo(sched_task_t *arg)
 
 void *timer(sched_task_t *arg)
 {
-	printf("Timer %d sec::\n", (int) TASK_ARG(arg));
+	printf("Timer %p sec::\n", TASK_ARG(arg));
 	return NULL;
 }
 
@@ -36,13 +38,14 @@ void *alarmz(sched_task_t *arg)
 
 void *node(sched_task_t *arg)
 {
-	printf("Node %s\n", (char*) TASK_ARG(arg));
+	printf("Node %s fflags 0x%X\n", (char*) TASK_ARG(arg), (u_int) TASK_DATLEN(arg));
 	return NULL;
 }
 
 void *proc(sched_task_t *arg)
 {
-	printf("Proc pid=%ld\n", TASK_VAL(arg));
+	printf("Proc pid=%ld fflags 0x%X data %p\n", TASK_VAL(arg), (u_int) TASK_DATLEN(arg), 
+			TASK_DATA(arg));
 	return NULL;
 }
 
@@ -52,11 +55,13 @@ void *sigz(sched_task_t *arg)
 	return NULL;
 }
 
+#ifdef EVFILT_USER
 void *user(sched_task_t *arg)
 {
-	printf("User trigger id %ld\n", TASK_VAL(arg));
+	printf("User trigger id %ld fflags %d\n", TASK_VAL(arg), TASK_DATLEN(arg) & NOTE_FFLAGSMASK);
 	return NULL;
 }
+#endif
 
 void *once(sched_task_t *arg)
 {
@@ -70,6 +75,8 @@ void sig(int s)
 		case SIGTERM:
 			Kill++;
 			break;
+		case SIGUSR1:
+			break;
 	}
 }
 
@@ -80,8 +87,15 @@ main(int argc, char **argv)
 	struct timespec ts = { 20, 0 };
 //	struct timespec p = { 0, 10000000 };
 	int f = 0;
+	struct sigaction sa;
+#ifdef EVFILT_USER
+	sched_task_t *t[4];
+#endif
 
-	signal(SIGTERM, sig);
+	sa.sa_handler = sig;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGTERM, &sa, NULL);
+	sigaction(SIGUSR1, &sa, NULL);
 
 	root = schedBegin();
 	if (!root) {
@@ -139,10 +153,24 @@ main(int argc, char **argv)
 		return 5;
 	}
 
-	if (!schedUser(root, user, NULL, 42, 0, 0)) {
+#ifdef EVFILT_USER
+	if (!(t[0] = schedUser(root, user, NULL, 42, 0, 0))) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
+	if (!(t[1] = schedUser(root, user, NULL, 1, 0, 73))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 6;
+	}
+	if (!(t[2] = schedUser(root, user, NULL, 0xaa, 0, NOTE_FFAND | 0xaa))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 6;
+	}
+	if (!(t[3] = schedUser(root, user, NULL, -1, 0, NOTE_FFCOPY | 1003))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 6;
+	}
+#endif
 
 	if (argc > 1)
 		if (!schedProc(root, proc, NULL, atoi(argv[1]), 0, 0)) {
@@ -161,6 +189,22 @@ main(int argc, char **argv)
 			return 8;
 		}
 	}
+
+#ifdef EVFILT_USER
+	schedTrigger(t[3]);
+	schedTrigger(t[1]);
+#endif
+
+	if (!schedSignal(root, sigz, NULL, SIGUSR1, 0, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		close(f);
+		return 9;
+	}
+
+#ifdef EVFILT_USER
+	schedTrigger(t[2]);
+	schedTrigger(t[0]);
+#endif
 
 	schedCallOnce(root, once, "000000", 42, NULL, 0);