diff --git a/ChangeLog b/ChangeLog index 97bb304f1f..e14afe9db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -808,6 +808,8 @@ * lib/: Greatly simplified mktime() and gmtime_r(). The Gregorian and Julian time calculations were interesting, but not necessary in the typical embeddd system. + * sched/: Added gettimeofday(). This implementation is simply a thin + wrapper around clock_gettimer(). diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 627a5bd6c6..908c927c83 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1481,6 +1481,8 @@ nuttx-0.4.10 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * lib/: Greatly simplified mktime() and gmtime_r(). The Gregorian and Julian time calculations were interesting, but not necessary in the typical embeddd system. + * sched/: Added gettimeofday(). This implementation is simply a thin + wrapper around clock_gettimer(). nuttx-0.4.10 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html index 05fa44f142..7c6bb0f0a3 100644 --- a/Documentation/NuttxUserGuide.html +++ b/Documentation/NuttxUserGuide.html @@ -2469,6 +2469,7 @@ VxWorks provides the following comparable interface:
  • 2.7.9 timer_settime
  • 2.7.10 timer_gettime
  • 2.7.11 timer_getoverrun
    • +
  • 2.7.12 gettimeofday

    • 2.7.1 clock_settime

    @@ -2917,6 +2918,33 @@ VxWorks provides the following comparable interface: interface of the same name.

    +

    2.7.12 gettimeofday

    +

    + Function Prototype: +

    +
    +    #include <sys/time.h>
+    int gettimeofday(struct timeval *tp, void *tzp);
+
    +

    + Description: + This implementation of gettimeofday() is simply a thin wrapper around + clock_gettime(). + It simply calls clock_gettime() using the CLOCK_REALTIME timer and + converts the result to the required struct timeval. +

    +

    + Input Parameters: +

    + +

    + Returned Values: + See clock_gettime(). +

    +
    diff --git a/include/sys/time.h b/include/sys/time.h new file mode 100644 index 0000000000..31efe1868f --- /dev/null +++ b/include/sys/time.h @@ -0,0 +1,75 @@ +/**************************************************************************** + * include/sys/time.h + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 NuttX 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. + * + ****************************************************************************/ + +#ifndef __SYS_MMAN_H +#define __SYS_MMAN_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + + +/**************************************************************************** + * Public Type Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +EXTERN int gettimeofday(struct timeval *tp, void *tzp); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __SYS_MMAN_H */ diff --git a/sched/Makefile b/sched/Makefile index 288aade45c..84609a0215 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -72,7 +72,8 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y) TIME_SRCS += sleep.c usleep.c endif CLOCK_SRCS = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c \ - clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c + clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c \ + clock_gettimeofday.c SIGNAL_SRCS = sig_initialize.c \ sig_action.c sig_procmask.c sig_pending.c sig_suspend.c \ diff --git a/sched/clock_gettimeofday.c b/sched/clock_gettimeofday.c new file mode 100644 index 0000000000..ccc6fc9b3b --- /dev/null +++ b/sched/clock_gettimeofday.c @@ -0,0 +1,111 @@ +/**************************************************************************** + * sched/clock_gettimeofday.c + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 NuttX 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +#include +#include +#include "clock_internal.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Type Declarations + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/************************************************************************** + * Public Constant Data + **************************************************************************/ + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/************************************************************************** + * Private Variables + **************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Function: gettimeofday + * + * Description: + * Get the current time + * + ****************************************************************************/ + +int gettimeofday(struct timeval *tp, void *tzp) +{ + struct timespec ts; + int ret; + +#ifdef CONFIG_DEBUG + if (!tp) + { + errno = EINVAL; + return ERROR; + } +#endif + + /* Let clock_gettime do most of the work */ + + ret = clock_gettime(CLOCK_REALTIME, &ts); + if (ret == OK) + { + /* Convert the struct timespec to a struct timeval */ + + tp->tv_sec = ts.tv_sec; + tp->tv_usec = ts.tv_nsec / NSEC_PER_USEC; + } + return ret; +}