--- libaitsched/inc/aitsched.h 2012/08/08 08:25:39 1.13 +++ libaitsched/inc/aitsched.h 2013/05/26 20:14:02 1.17.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.13 2012/08/08 08:25:39 misho Exp $ +* $Id: aitsched.h,v 1.17.2.1 2013/05/26 20:14:02 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -53,6 +53,7 @@ SUCH DAMAGE. #include #include #include +#include #ifdef EVFILT_LIO #include #endif @@ -89,6 +90,7 @@ typedef enum { taskSUSPEND, taskREADY, taskUNUSE, + taskTHREAD, taskMAX } sched_task_type_t; @@ -122,8 +124,12 @@ struct sched_HooksTask { sched_hook_func_t task; /* suspend(sched_task_t *task, NULL) -> int */ sched_hook_func_t suspend; + /* thread(sched_task_t *task, NULL) -> int */ + sched_hook_func_t thread; } hook_add; struct { + /* exit(sched_task_t *task, void *exitValue) -> int */ + sched_hook_func_t exit; /* cancel(sched_task_t *task, NULL) -> int */ sched_hook_func_t cancel; /* resume(sched_task_t *task, NULL) -> int */ @@ -158,16 +164,20 @@ typedef void *(*sched_task_func_t)(sched_task_t * /* c /* task & queue */ struct sched_Task { - volatile int task_lock; uintptr_t task_id; #define TASK_ID(x) ((struct sched_Task*) (x)->task_id) sched_task_type_t task_type; #define TASK_TYPE(x) (x)->task_type + volatile int task_lock; sched_root_task_t *task_root; #define TASK_ROOT(x) (x)->task_root sched_task_func_t task_func; #define TASK_FUNC(x) (x)->task_func + intptr_t task_ret; +#define TASK_RET(x) (x)->task_ret + unsigned int task_flag; +#define TASK_FLAG(x) (x)->task_flag void *task_arg; union { @@ -197,8 +207,7 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; - unsigned int root_miss; - unsigned int root_task_miss; + unsigned long root_miss; struct timespec root_wait; struct timespec root_poll; intptr_t root_cond; @@ -221,6 +230,7 @@ struct sched_RootTask { sched_queue_t root_suspend; sched_queue_t root_ready; sched_queue_t root_unuse; + sched_queue_t root_thread; hooks_task_t root_hooks; struct iovec root_data; @@ -231,8 +241,8 @@ struct sched_RootTask { #define ROOT_RETURN(x) (x)->root_ret -inline int sched_GetErrno(); -inline const char *sched_GetError(); +int sched_GetErrno(); +const char *sched_GetError(); /* @@ -259,6 +269,20 @@ int schedEnd(sched_root_task_t ** __restrict root); */ int schedRegisterHooks(sched_root_task_t * __restrict root); /* + * sched_useTask() - Get and init new task + * + * @root = root task + * return: NULL error or !=NULL prepared task + */ +sched_task_t *sched_useTask(sched_root_task_t * __restrict root); +/* + * sched_unuseTask() - Unlock and put task to unuse queue + * + * @task = task + * return: always is NULL + */ +sched_task_t *sched_unuseTask(sched_task_t * __restrict task); +/* * schedPolling() - Polling timeout period if no timer task is present * * @root = root task @@ -266,7 +290,7 @@ int schedRegisterHooks(sched_root_task_t * __restrict * @tsold = old timeout polling if !=NULL * return: -1 error or 0 ok */ -inline int schedPolling(sched_root_task_t * __restrict root, +int schedPolling(sched_root_task_t * __restrict root, struct timespec * __restrict ts, struct timespec * __restrict tsold); /* * schedTermCondition() - Activate hook for scheduler condition kill @@ -275,29 +299,21 @@ inline int schedPolling(sched_root_task_t * __restrict * @condValue = condition value, kill schedRun() if condValue == killState * return: -1 error or 0 ok */ -inline int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue); +int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue); /* - * schedMissEvents() - Set new miss events rate for regular tasks - * - * @root = root task - * @missEvents = maximum number of missed events before firing tasks - * return: -1 error or 0 ok - */ -inline int schedMissEvents(sched_root_task_t * __restrict root, u_int missEvents); -/* * schedCall() - Call task execution function * * @task = current task * return: !=NULL error or =NULL ok */ -inline void *schedCall(sched_task_t * __restrict task); +void *schedCall(sched_task_t * __restrict task); /* * schedFetch() - Fetch ready task * * @root = root task * return: =NULL error or !=NULL ready task */ -inline void *schedFetch(sched_root_task_t * __restrict root); +void *schedFetch(sched_root_task_t * __restrict root); /* * schedRun() - Scheduler *run loop* * @@ -445,7 +461,7 @@ sched_task_t *schedAIO(sched_root_task_t * __restrict * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t *schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, +sched_task_t *schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *buffer, size_t buflen, off_t offset); /* * schedAIOWrite() - Add AIO write task to scheduler queue @@ -459,7 +475,7 @@ inline sched_task_t *schedAIORead(sched_root_task_t * * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t *schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, +sched_task_t *schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *buffer, size_t buflen, off_t offset); /* @@ -487,7 +503,7 @@ sched_task_t *schedLIO(sched_root_task_t * __restrict * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t *schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, +sched_task_t *schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, struct iovec *bufs, size_t nbufs, off_t offset); /* * schedLIOWrite() - Add list of AIO write tasks to scheduler queue @@ -501,7 +517,7 @@ inline sched_task_t *schedLIORead(sched_root_task_t * * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t *schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, +sched_task_t *schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, struct iovec *bufs, size_t nbufs, off_t offset); #endif /* EVFILT_LIO */ @@ -614,6 +630,39 @@ sched_task_t *schedCallOnce(sched_root_task_t * __rest unsigned long val, void *opt_data, size_t opt_dlen); #define schedCallAgain(x) schedCallOnce(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) + +/* + * schedThread() - Add thread task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @detach = Detach thread from scheduler, if !=0 + * @ss = stack size + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int detach, size_t ss, void *opt_data, size_t opt_dlen); +#define schedThreadSelf(x) schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + (TASK_FLAG((x)) & 0x1), (size_t) (TASK_FLAG((x)) >> 1), TASK_DATA((x)), TASK_DATLEN((x))) +/* + * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks + * + * @task = current task + * @retcode = return code + * return: return code + */ +void *sched_taskExit(sched_task_t *task, intptr_t retcode); +/* + * taskExit() - Exit helper for scheduler task + * + * @t = current executed task + * @x = exit value for task + * return: none + */ +#define taskExit(t, x) return sched_taskExit((t), (intptr_t) (x)) #endif