--- libaitsched/src/tasks.c	2012/01/08 03:50:11	1.4.2.1
+++ libaitsched/src/tasks.c	2012/01/23 15:56:23	1.4.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.4.2.1 2012/01/08 03:50:11 misho Exp $
+* $Id: tasks.c,v 1.4.2.2 2012/01/23 15:56:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -103,10 +103,13 @@ _sched_unuseTask(sched_task_t * __restrict 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 *
-schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
+schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -128,6 +131,9 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.read)
 		ptr = root->root_hooks.hook_add.read(task, NULL);
 	else
@@ -153,10 +159,13 @@ schedRead(sched_root_task_t * __restrict root, sched_t
  * @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 *
-schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
+schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -178,6 +187,9 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.write)
 		ptr = root->root_hooks.hook_add.write(task, NULL);
 	else
@@ -203,10 +215,13 @@ schedWrite(sched_root_task_t * __restrict root, sched_
  * @func = task execution function
  * @arg = 1st func argument
  * @tv = timeout argument structure
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv)
+schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task, *t = NULL;
 	void *ptr;
@@ -229,6 +244,9 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 
 	TASK_ARG(task) = arg;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	/* calculate timeval structure */
 	clock_gettime(CLOCK_MONOTONIC, &nw);
 	now.tv_sec = nw.tv_sec + tv.tv_sec;
@@ -277,10 +295,13 @@ schedTimer(sched_root_task_t * __restrict root, sched_
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
+schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -302,6 +323,9 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.event)
 		ptr = root->root_hooks.hook_add.event(task, NULL);
 	else
@@ -328,10 +352,13 @@ schedEvent(sched_root_task_t * __restrict root, sched_
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
+schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -353,6 +380,9 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.eventlo)
 		ptr = root->root_hooks.hook_add.eventlo(task, NULL);
 	else
@@ -378,10 +408,13 @@ schedEventLo(sched_root_task_t * __restrict root, sche
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: return value from called func
  */
 sched_task_t *
-schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
+schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ret;
@@ -402,6 +435,9 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
 
 	ret = schedCall(task);