[BACK]Return to aitsched.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitsched / inc

Diff for /libaitsched/inc/aitsched.h between versions 1.1.1.1 and 1.4.2.2

version 1.1.1.1, 2011/08/05 15:52:00 version 1.4.2.2, 2012/01/08 02:52:29
Line 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
 #define __AITSCHED_H  #define __AITSCHED_H
   
   
   #include <sys/types.h>
   #include <sys/queue.h>
   #include <sys/uio.h>
   #include <stdint.h>
   
   
 /* criteria type */  /* criteria type */
 #define CRITERIA_CALL   0  #define CRITERIA_CALL   0
 #define CRITERIA_ARG    1  #define CRITERIA_ARG    1
Line 64  typedef enum { Line 70  typedef enum {
         taskWRITE,          taskWRITE,
         taskTIMER,          taskTIMER,
         taskEVENT,           taskEVENT, 
           taskEVENTLO, 
         taskREADY,          taskREADY,
         taskUNUSE,          taskUNUSE,
         taskMAX          taskMAX
Line 91  struct sched_HooksTask { Line 98  struct sched_HooksTask {
                 sched_hook_func_t       run;                  sched_hook_func_t       run;
                 /* fetch(sched_root_task_t *root, NULL) -> sched_task_t* */                  /* fetch(sched_root_task_t *root, NULL) -> sched_task_t* */
                 sched_hook_func_t       fetch;                  sched_hook_func_t       fetch;
                   /* exception(sched_root_task_t *root, NULL) -> int */
                   sched_hook_func_t       exception;
         }       hook_exec;          }       hook_exec;
         struct {          struct {
                 /* init(sched_root_task_t *root, void *data) -> int */                  /* init(sched_root_task_t *root, void *data) -> int */
                 sched_hook_func_t       init;                  sched_hook_func_t       init;
                 /* fini(sched_root_task_t *root, NULL) -> int */                  /* fini(sched_root_task_t *root, NULL) -> int */
                 sched_hook_func_t       fini;                  sched_hook_func_t       fini;
                   /* error(sched_root_task_t *root, int errno) -> int */
                   sched_hook_func_t       error;
         }       hook_root;          }       hook_root;
 };  };
 typedef struct sched_HooksTask hooks_task_t;  typedef struct sched_HooksTask hooks_task_t;
   
 /* task callback, like pthread callback! */  /* task callback, like pthread callback! */
typedef void *(*sched_task_func_t)(void *);typedef void *(*sched_task_func_t)(sched_task_t * /* current task data*/);
   
   /* task lock helpers */
   #define TASK_LOCK(x)            ((x)->task_lock++)
   #define TASK_UNLOCK(x)          ((x)->task_lock ^= (x)->task_lock)
   #define TASK_ISLOCKED(x)        ((x)->task_lock)
   
 /* task & queue */  /* task & queue */
 struct sched_Task {  struct sched_Task {
           volatile int                    task_lock;
         unsigned int                    task_id;          unsigned int                    task_id;
         sched_task_type_t               task_type;          sched_task_type_t               task_type;
   #define TASK_TYPE(x)    (x)->task_type
   
         sched_root_task_t               *task_root;          sched_root_task_t               *task_root;
   #define TASK_ROOT(x)    (x)->task_root
         sched_task_func_t               task_func;          sched_task_func_t               task_func;
   
         void                            *task_arg;          void                            *task_arg;
         union {          union {
                 unsigned long   v;                  unsigned long   v;
                int             fd;                intptr_t        fd;
                 struct timeval  tv;                  struct timeval  tv;
         }                               task_val;          }                               task_val;
 #define TASK_ARG(x)     (x)->task_arg  #define TASK_ARG(x)     (x)->task_arg
Line 135  typedef TAILQ_HEAD(, sched_Task) sched_queue_t; Line 154  typedef TAILQ_HEAD(, sched_Task) sched_queue_t;
 struct sched_RootTask {  struct sched_RootTask {
         int             root_kq;          int             root_kq;
         struct timeval  root_wait;          struct timeval  root_wait;
           pthread_mutex_t root_mtx[taskMAX];
   
         sched_queue_t   root_read;          sched_queue_t   root_read;
         sched_queue_t   root_write;          sched_queue_t   root_write;
Line 152  struct sched_RootTask { Line 172  struct sched_RootTask {
 };  };
   
   
   inline int sched_GetErrno();
   inline const char *sched_GetError();
   
   
 /*  /*
  * schedInit() - Init scheduler   * schedInit() - Init scheduler
  * @data = optional data if !=NULL   * @data = optional data if !=NULL
Line 159  struct sched_RootTask { Line 183  struct sched_RootTask {
  * return: allocated root task if ok or NULL error   * return: allocated root task if ok or NULL error
  */   */
 sched_root_task_t *schedInit(void ** __restrict data, size_t datlen);  sched_root_task_t *schedInit(void ** __restrict data, size_t datlen);
#define schedInitIO()      schedInit(&schedRegisterIO, 0)#define schedBegin()      schedInit((void**) &schedRegisterHooks, 0)
 /*  /*
  * schedEnd() - End scheduler & free all resources   * schedEnd() - End scheduler & free all resources
  * @root = root task   * @root = root task
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
int schedEnd(sched_root_task_t * __restrict root);int schedEnd(sched_root_task_t ** __restrict root);
 /*  /*
 * schedRegisterIO() - Register IO handles and bind tasks to it * schedRegisterHooks() - Register IO handles and bind tasks to it
  * @root = root task   * @root = root task
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
int schedRegisterIO(sched_root_task_t * __restrict root);int schedRegisterHooks(sched_root_task_t * __restrict root);
 /*  /*
  * schedCall() - Call task execution function   * schedCall() - Call task execution function
  * @task = current task   * @task = current task
Line 187  inline void *schedFetch(sched_root_task_t * __restrict Line 211  inline void *schedFetch(sched_root_task_t * __restrict
 /*  /*
  * schedRun() - Scheduler *run loop*   * schedRun() - Scheduler *run loop*
  * @root = root task   * @root = root task
    * @killState = kill condition variable, if !=0 stop scheduler loop
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
int schedRun(sched_root_task_t * __restrict root);int schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState);
 /*  /*
  * schedCancel() - Cancel task from scheduler   * schedCancel() - Cancel task from scheduler
  * @task = task   * @task = task
Line 199  int schedCancel(sched_task_t * __restrict task); Line 224  int schedCancel(sched_task_t * __restrict task);
 /*  /*
  * schedCancelby() - Cancel task from scheduler by criteria   * schedCancelby() - Cancel task from scheduler by criteria
  * @root = root task   * @root = root task
 * @queue = cancel from queue, if =NULL cancel same task from all queues * @type = cancel from queue type, if =taskMAX cancel same task from all queues
  * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TV]   * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TV]
  * @param = search parameter   * @param = search parameter
  * @hook = custom cleanup hook function, may be NULL   * @hook = custom cleanup hook function, may be NULL
 * return: -1 error or 0 ok * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok
  */   */
int schedCancelby(sched_root_task_t * __restrict root, sched_queue_t * __restrict queue, int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, 
                 u_char criteria, void *param, sched_hook_func_t hook);                  u_char criteria, void *param, sched_hook_func_t hook);
   
   
 /*  /*
 * schedRead() - Add READ task to scheduler queue * schedRead() - Add READ I/O task to scheduler queue
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments, like fd handle * @fd = fd handle
  * return: NULL error or !=NULL new queued task   * 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, ...);sched_task_t *schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd);
 /*  /*
 * schedWrite() - Add WRITE task to scheduler queue * schedWrite() - Add WRITE I/O task to scheduler queue
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments, like fd handle * @fd = fd handle
  * return: NULL error or !=NULL new queued task   * 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, ...);sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd);
 /*  /*
  * schedTimer() - Add TIMER task to scheduler queue   * schedTimer() - Add TIMER task to scheduler queue
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments in microSecs, define period 1sec == 1000000 * @tv = timeout argument structure
  * return: NULL error or !=NULL new queued task   * 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, ...);sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv);
 /*  /*
  * schedEvent() - Add EVENT task to scheduler queue   * schedEvent() - Add EVENT task to scheduler queue
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments, like u_long * @val = additional func argument
  * return: NULL error or !=NULL new queued task   * 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, ...);sched_task_t *schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
 /*  /*
  * schedEventLo() - Add EVENT_Lo task to scheduler queue   * schedEventLo() - Add EVENT_Lo task to scheduler queue
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments, like u_long * @val = additional func argument
  * return: NULL error or !=NULL new queued task   * 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, ...);sched_task_t *schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
 /*  /*
  * schedCallOnce() - Call once from scheduler   * schedCallOnce() - Call once from scheduler
  * @root = root task   * @root = root task
  * @func = task execution function   * @func = task execution function
  * @arg = 1st func argument   * @arg = 1st func argument
 * @... = next func arguments, like u_long * @val = additional func argument
 * return: NULL error or !=NULL new queued task * return: return value from called func
  */   */
sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
   
   
 #endif  #endif
Removed from v.1.1.1.1  
changed lines
  Added in v.1.4.2.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>