libaitsched/src/aitsched.c - diff

Return to aitsched.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitsched / src

Diff for /libaitsched/src/aitsched.c between versions 1.23.2.1 and 1.25.2.3

-version 1.23.2.1, 2014/01/27 16:52:56
+version 1.25.2.3, 2014/05/21 22:09:01
  Line 12  terms:
  All of the documentation and software included in the ELWIX and AITNET
  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
          by Michael Pounov <misho@elwix.org>.  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  Line 82  sched_SetErr(int eno, char *estr, ...)
          va_end(lst);
  }
+ /* string support functions directly imported from OpenBSD */
+ #ifndef HAVE_STRLCAT
+ /*
+  * Appends src to string dst of size siz (unlike strncat, siz is the
+  * full size of dst, not space left).  At most siz-1 characters
+  * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+  * If retval >= siz, truncation occurred.
+  */
+ size_t
+ strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
+ {
+         char *d = dst;
+         const char *s = src;
+         size_t n = siz;
+         size_t dlen;
+         /* Find the end of dst and adjust bytes left but don't go past end */
+         while (n-- != 0 && *d != '\0')
+                 d++;
+         dlen = d - dst;
+         n = siz - dlen;
+         if (n == 0)
+                 return(dlen + strlen(s));
+         while (*s != '\0') {
+                 if (n != 1) {
+                         *d++ = *s;
+                         n--;
+                 }
+                 s++;
+         }
+         *d = '\0';
+         return(dlen + (s - src));       /* count does not include NUL */
+ }
+ #endif
+ #ifndef HAVE_STRLCPY
+ /*
+  * Copy src to string dst of size siz.  At most siz-1 characters
+  * will be copied.  Always NUL terminates (unless siz == 0).
+  * Returns strlen(src); if retval >= siz, truncation occurred.
+  */
+ size_t
+ strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
+ {
+         char *d = dst;
+         const char *s = src;
+         size_t n = siz;
+         /* Copy as many bytes as will fit */
+         if (n != 0) {
+                 while (--n != 0) {
+                         if ((*d++ = *s++) == '\0')
+                                 break;
+                 }
+         }
+         /* Not enough room in dst, add NUL and traverse rest of src */
+         if (n == 0) {
+                 if (siz != 0)
+                         *d = '\0';              /* NUL-terminate dst */
+                 while (*s++)
+                         ;
+         }
+         return(s - src - 1);    /* count does not include NUL */
+ }
+ #endif
  /* Init and prepare scheduler functions */
  /*
- Line 102  schedRegisterHooks(sched_root_task_t * __restrict root
+ Line 175  schedRegisterHooks(sched_root_task_t * __restrict root
          root->root_hooks.hook_add.read = sched_hook_read;
          root->root_hooks.hook_add.write = sched_hook_write;
          root->root_hooks.hook_add.alarm = sched_hook_alarm;
-#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE)
          root->root_hooks.hook_add.rtc = sched_hook_rtc;
  #endif
          root->root_hooks.hook_add.node = sched_hook_node;
- Line 150  schedInit(void ** __restrict data, size_t datlen)
+ Line 223  schedInit(void ** __restrict data, size_t datlen)
                  root->root_miss = MAX_TASK_MISS;
                  /* INFINIT polling period by default */
- #ifndef KQ_DISABLE
                  sched_timespecinf(&root->root_poll);
- #else
-                 sched_timevalinf(&root->root_poll);
- #endif
  #ifdef HAVE_LIBPTHREAD
                  for (i = 0; i < taskMAX; i++)
- Line 339  schedFetch(sched_root_task_t * __restrict root)
+ Line 408  schedFetch(sched_root_task_t * __restrict root)
  int
  schedTrigger(sched_task_t * __restrict task)
  {
+ #if SUP_ENABLE != KQ_SUPPORT
+         sched_SetErr(ENOTSUP, "disabled kqueue support");
+         return -1;
+ #else
  #ifndef EVFILT_USER
          sched_SetErr(ENOTSUP, "Not supported kevent() filter");
          return -1;
- Line 361  schedTrigger(sched_task_t * __restrict task)
+ Line 434  schedTrigger(sched_task_t * __restrict task)
          return 0;
  #endif
+ #endif  /* KQ_SUPPORT */
  }
  /*
- Line 919  schedPolling(sched_root_task_t * __restrict root, stru
+ Line 993  schedPolling(sched_root_task_t * __restrict root, stru
          if (!root)
                  return -1;
- #ifndef KQ_DISABLE
          if (tsold)
                  *tsold = root->root_poll;
- Line 927  schedPolling(sched_root_task_t * __restrict root, stru
+ Line 1000  schedPolling(sched_root_task_t * __restrict root, stru
                  sched_timespecinf(&root->root_poll);
          else
                  root->root_poll = *ts;
- #else
-         if (tsold)
-                 sched_timeval2spec(&root->root_poll, tsold);
-         if (!ts)
-                 sched_timevalinf(&root->root_poll);
-         else
-                 sched_timespec2val(ts, &root->root_poll);
- #endif
          return 0;
  }

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

Removed from v.1.23.2.1
changed lines
	Added in v.1.25.2.3