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

Diff for /libaitsched/src/aitsched.c between versions 1.5 and 1.6

version 1.5, 2012/01/24 21:59:47 version 1.6, 2012/03/13 10:01:59
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 86  sched_SetErr(int eno, char *estr, ...) Line 86  sched_SetErr(int eno, char *estr, ...)
   
 /*  /*
  * schedRegisterHooks() - 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
  */   */
Line 113  schedRegisterHooks(sched_root_task_t * __restrict root Line 114  schedRegisterHooks(sched_root_task_t * __restrict root
   
 /*  /*
  * schedInit() - Init scheduler   * schedInit() - Init scheduler
    *
  * @data = optional data if !=NULL   * @data = optional data if !=NULL
  * @datlen = data len if data is set   * @datlen = data len if data is set
  * return: allocated root task if ok or NULL error   * return: allocated root task if ok or NULL error
Line 182  schedInit(void ** __restrict data, size_t datlen) Line 184  schedInit(void ** __restrict data, size_t datlen)
   
 /*  /*
  * 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
  */   */
Line 241  schedEnd(sched_root_task_t ** __restrict root) Line 244  schedEnd(sched_root_task_t ** __restrict root)
   
 /*  /*
  * schedCall() - Call task execution function   * schedCall() - Call task execution function
    *
  * @task = current task   * @task = current task
  * return: !=NULL error or =NULL ok   * return: !=NULL error or =NULL ok
  */   */
Line 264  schedCall(sched_task_t * __restrict task) Line 268  schedCall(sched_task_t * __restrict task)
   
 /*  /*
  * schedFetch() - Fetch ready task   * schedFetch() - Fetch ready task
    *
  * @root = root task   * @root = root task
  * return: =NULL error or !=NULL ready task   * return: =NULL error or !=NULL ready task
  */   */
Line 285  schedFetch(sched_root_task_t * __restrict root) Line 290  schedFetch(sched_root_task_t * __restrict root)
   
 /*  /*
  * schedCancel() - Cancel task from scheduler   * schedCancel() - Cancel task from scheduler
    *
  * @task = task   * @task = task
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
Line 339  schedCancel(sched_task_t * __restrict task) Line 345  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
  * @type = cancel from queue type, if =taskMAX 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]
Line 458  schedCancelby(sched_root_task_t * __restrict root, sch Line 465  schedCancelby(sched_root_task_t * __restrict root, sch
   
 /*  /*
  * schedRun() - Scheduler *run loop*   * schedRun() - Scheduler *run loop*
    *
  * @root = root task   * @root = root task
  * @killState = kill condition variable, if !=0 stop scheduler loop   * @killState = kill condition variable, if !=0 stop scheduler loop
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
Line 474  schedRun(sched_root_task_t * __restrict root, volatile Line 482  schedRun(sched_root_task_t * __restrict root, volatile
                 if (root->root_hooks.hook_exec.run(root, NULL))                  if (root->root_hooks.hook_exec.run(root, NULL))
                         return -1;                          return -1;
         if (root->root_hooks.hook_exec.fetch) {          if (root->root_hooks.hook_exec.fetch) {
                if (killState)                if (killState) {
                        while (!*killState) {                        if (root->root_hooks.hook_exec.condition)
                                if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))                                while (root->root_hooks.hook_exec.condition(root, (void*) killState)) {
                                        schedCall(task);                                        if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
                        }                                                schedCall(task);
                else                                }
                         else
                                 while (!*killState) {
                                         if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
                                                 schedCall(task);
                                 }
                 } else
                         while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))                          while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
                                 schedCall(task);                                  schedCall(task);
         }          }
Line 489  schedRun(sched_root_task_t * __restrict root, volatile Line 503  schedRun(sched_root_task_t * __restrict root, volatile
   
 /*  /*
  * schedPolling() - Polling timeout period if no timer task is present   * schedPolling() - Polling timeout period if no timer task is present
    *
  * @root = root task   * @root = root task
  * @ts = timeout polling period, if ==NULL INFINIT timeout   * @ts = timeout polling period, if ==NULL INFINIT timeout
  * @tsold = old timeout polling if !=NULL   * @tsold = old timeout polling if !=NULL
Line 509  schedPolling(sched_root_task_t * __restrict root, stru Line 524  schedPolling(sched_root_task_t * __restrict root, stru
         else          else
                 root->root_poll = *ts;                  root->root_poll = *ts;
   
           return 0;
   }
   
   /*
    * schedTermCondition() - Activate hook for scheduler condition kill
    *
    * @root = root task
    * @condValue = condition value, kill schedRun() if condValue == killState
    * return: -1 error ok 0 ok
    */
   inline int
   schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue)
   {
           if (!root)
                   return -1;
   
           root->root_cond = condValue;
           root->root_hooks.hook_exec.condition = sched_hook_condition;
         return 0;          return 0;
 }  }
Removed from v.1.5  
changed lines
  Added in v.1.6

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