Added support for POSIX timers

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@111 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 261 insertions, 5 deletions

diff --git a/nuttx/examples/ostest/Makefile b/nuttx/examples/ostest/Makefile
index ed7859fc8..d8101368f 100644
--- a/nuttx/examples/ostest/Makefile
+++ b/nuttx/examples/ostest/Makefile
@@ -55,6 +55,9 @@ ifneq ($(CONFIG_DISABLE_PTHREAD),y)
 CSRCS	+= mqueue.c 
 endif
 endif
+ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
+CSRCS	+= posixtimer.c
+endif
 
 COBJS	= $(CSRCS:.c=$(OBJEXT))
 
diff --git a/nuttx/examples/ostest/main.c b/nuttx/examples/ostest/main.c
index 497aa3e4f..b4aa5deed 100644
--- a/nuttx/examples/ostest/main.c
+++ b/nuttx/examples/ostest/main.c
@@ -165,6 +165,12 @@ static int user_main(int argc, char *argv[])
   sighand_test();
 #endif
 
+#if !defined(CONFIG_DISABLE_POSIX_TIMERS) && !defined(CONFIG_DISABLE_SIGNALS)
+  /* Verify posix timers */
+
+  timer_test();
+#endif
+
 #if !defined(CONFIG_DISABLE_PTHREAD) && CONFIG_RR_INTERVAL > 0
   /* Verify round robin scheduling */
 
diff --git a/nuttx/examples/ostest/posixtimer.c b/nuttx/examples/ostest/posixtimer.c
new file mode 100644
index 000000000..619c4f59d
--- /dev/null
+++ b/nuttx/examples/ostest/posixtimer.c
@@ -0,0 +1,245 @@
+/***********************************************************************
+ * posixtimer.c
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ***********************************************************************/
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <sched.h>
+#include <errno.h>
+#include "ostest.h"
+
+#ifndef NULL
+# define NULL (void*)0
+#endif
+
+#define MY_TIMER_SIGNAL 17
+#define SIGVALUE_INT  42
+
+static sem_t sem;
+static int g_nsigreceived = 0;
+
+static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
+{
+  sigset_t oldset;
+  sigset_t allsigs;
+  int status;
+
+  printf("timer_expiration: Received signal %d\n" , signo);
+
+  g_nsigreceived++;
+
+  /* Check signo */
+
+  if (signo != MY_TIMER_SIGNAL)
+    {
+      printf("timer_expiration: ERROR expected signo=%d\n" , MY_TIMER_SIGNAL);
+    }
+
+  /* Check siginfo */
+
+  if (info->si_value.sival_int != SIGVALUE_INT)
+    {
+      printf("timer_expiration: ERROR sival_int=%d expected %d\n",
+              info->si_value.sival_int, SIGVALUE_INT);
+    }
+  else
+    {
+      printf("timer_expiration: sival_int=%d\n" , info->si_value.sival_int);
+    }
+
+  if (info->si_signo != MY_TIMER_SIGNAL)
+    {
+      printf("timer_expiration: ERROR expected si_signo=%d, got=%d\n",
+               MY_TIMER_SIGNAL, info->si_signo);
+    }
+
+  if (info->si_code == SI_TIMER)
+    {
+      printf("timer_expiration: si_code=%d (SI_TIMER)\n" , info->si_code);
+    }
+  else
+    {
+      printf("timer_expiration: ERROR si_code=%d, expected SI_TIMER=%d\n",
+             info->si_code, SI_TIMER);
+    }
+
+  /* Check ucontext_t */
+
+  printf("timer_expiration: ucontext=%p\n" , ucontext);
+
+  /* Check sigprocmask */
+
+  (void)sigfillset(&allsigs);
+  status = sigprocmask(SIG_SETMASK, NULL, &oldset);
+  if (status != OK)
+    {
+      printf("timer_expiration: ERROR sigprocmask failed, status=%d\n",
+              status);
+    }
+
+  if (oldset != allsigs)
+    {
+      printf("timer_expiration: ERROR sigprocmask=%x expected=%x\n",
+              oldset, allsigs);
+    }
+
+}
+
+void timer_test(void)
+{
+  struct sched_param param;
+  sigset_t           sigset;
+  struct sigaction   act;
+  struct sigaction   oact;
+  struct sigevent    notify;
+  struct itimerspec  timer;
+  timer_t            timerid;
+  int                status;
+  int                i;
+
+  printf("timer_test: Initializing semaphore to 0\n" );
+  sem_init(&sem, 0, 0);
+
+  /* Start waiter thread  */
+
+  printf("timer_test: Unmasking signal %d\n" , MY_TIMER_SIGNAL);
+
+  (void)sigemptyset(&sigset);
+  (void)sigaddset(&sigset, MY_TIMER_SIGNAL);
+  status = sigprocmask(SIG_UNBLOCK, &sigset, NULL);
+  if (status != OK)
+    {
+      printf("timer_test: ERROR sigprocmask failed, status=%d\n",
+              status);
+    }
+
+  printf("timer_test: Registering signal handler\n" );
+  act.sa_sigaction = timer_expiration;
+  act.sa_flags  = SA_SIGINFO;
+
+  (void)sigfillset(&act.sa_mask);
+  (void)sigdelset(&act.sa_mask, MY_TIMER_SIGNAL);
+
+  status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
+  if (status != OK)
+    {
+      printf("timer_test: ERROR sigaction failed, status=%d\n" , status);
+    }
+
+#ifndef SDCC
+  printf("timer_test: oact.sigaction=%p oact.sa_flags=%x oact.sa_mask=%x\n",
+          oact.sa_sigaction, oact.sa_flags, oact.sa_mask);
+#endif
+
+  /* Create the POSIX timer */
+
+  printf("timer_test: Creating timer\n" );
+
+  notify.sigev_notify          = SIGEV_SIGNAL;
+  notify.sigev_signo           = MY_TIMER_SIGNAL;
+  notify.sigev_value.sival_int = SIGVALUE_INT;
+
+  status = timer_create(CLOCK_REALTIME, &notify, &timerid);
+  if (status != OK)
+    {
+      printf("timer_test: timer_create failed, errno=%d\n", get_errno_ptr());
+      goto errorout;
+    }
+
+  /* Start the POSIX timer */
+
+  printf("timer_test: Starting timer\n" );
+
+  timer.it_value.tv_sec     = 2;
+  timer.it_value.tv_nsec    = 0;
+  timer.it_interval.tv_sec  = 2;
+  timer.it_interval.tv_nsec = 0;
+
+  status = timer_settime(timerid, 0, &timer, NULL);
+  if (status != OK)
+    {
+      printf("timer_test: timer_settime failed, errno=%d\n", get_errno_ptr());
+      goto errorout;
+    }
+
+  /* Take the semaphore */
+
+  for (i = 0; i < 5; i++)
+    {
+      printf("timer_test: Waiting on semaphore\n" );
+      fflush(stdout);
+      status = sem_wait(&sem);
+      if (status != 0)
+        {
+          int error = *get_errno_ptr();
+          if (error == EINTR)
+            {
+              printf("timer_test: sem_wait() successfully interrupted by signal\n" );
+            }
+          else
+            {
+              printf("timer_test: ERROR sem_wait failed, errno=%d\n" , error);
+            }
+        }
+      else
+        {
+          printf("timer_test: ERROR awakened with no error!\n" );
+        }
+      printf("timer_test: g_nsigreceived=%d\n", g_nsigreceived);
+    }
+
+errorout:
+  sem_destroy(&sem);
+
+  /* Then delete the timer */
+
+  printf("timer_test: Deleting timer\n" );
+  status = timer_delete(timerid);
+  if (status != OK)
+    {
+      printf("timer_test: timer_create failed, errno=%d\n", get_errno_ptr());
+    }
+
+  /* Detach the signal handler */
+
+  act.sa_sigaction = SIG_DFL;
+  status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
+
+  printf("timer_test: done\n" );
+  fflush(stdout);
+}
diff --git a/nuttx/examples/ostest/sighand.c b/nuttx/examples/ostest/sighand.c
index 4ea556612..cab2bcf39 100644
--- a/nuttx/examples/ostest/sighand.c
+++ b/nuttx/examples/ostest/sighand.c
@@ -110,7 +110,6 @@ static void wakeup_action(int signo, siginfo_t *info, void *ucontext)
       printf("wakeup_action: ERROR sigprocmask=%x expected=%x\n",
               oldset, allsigs);
     }
-
 }
 
 static int waiter_main(int argc, char *argv[])
@@ -120,7 +119,7 @@ static int waiter_main(int argc, char *argv[])
   struct sigaction oact;
   int status;
 
-  printf("wakeup_action: Waiter started\n" );
+  printf("waiter_main: Waiter started\n" );
 
   printf("waiter_main: Unmasking signal %d\n" , WAKEUP_SIGNAL);
   (void)sigemptyset(&sigset);
@@ -172,6 +171,11 @@ static int waiter_main(int argc, char *argv[])
       printf("waiter_main: ERROR awakened with no error!\n" );
     }
 
+  /* Detach the signal handler */
+
+  act.sa_sigaction = SIG_DFL;
+  status = sigaction(WAKEUP_SIGNAL, &act, &oact);
+
   printf("waiter_main: done\n" );
   fflush(stdout);
   threadexited = TRUE;
@@ -186,14 +190,12 @@ void sighand_test(void)
   int policy;
   int status;
 
-  printf("waiter_main: Initializing semaphore to 0\n" );
+  printf("sighand_test: Initializing semaphore to 0\n" );
   sem_init(&sem, 0, 0);
 
   /* Start waiter thread  */
 
   printf("sighand_test: Starting waiter task\n" );
-
-
   status = sched_getparam (0, &param);
   if (status != OK)
     {