--- libaitsched/inc/aitsched.h 2014/04/27 16:20:37 1.26 +++ libaitsched/inc/aitsched.h 2019/01/14 15:58:50 1.29 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.26 2014/04/27 16:20:37 misho Exp $ +* $Id: aitsched.h,v 1.29 2019/01/14 15:58:50 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 -Copyright 2004 - 2014 +Copyright 2004 - 2018 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -219,7 +219,7 @@ struct sched_RootTask { struct timespec root_wait; struct timespec root_poll; unsigned long root_miss; - intptr_t root_cond; + intptr_t root_cond[1]; void *root_ret; pthread_mutex_t root_mtx[taskMAX]; @@ -309,7 +309,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 * @@ -449,6 +449,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