fix _gettimeofday_r issue.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1325 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
parent
107dc2378a
commit
79696e8649
|
@ -170,6 +170,70 @@ _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
|
|||
return rc;
|
||||
}
|
||||
|
||||
#ifndef RT_USING_PTHREADS
|
||||
|
||||
#ifndef MILLISECOND_PER_SECOND
|
||||
#define MILLISECOND_PER_SECOND 1000UL
|
||||
#endif
|
||||
|
||||
#ifndef MICROSECOND_PER_SECOND
|
||||
#define MICROSECOND_PER_SECOND 1000000UL
|
||||
#endif
|
||||
|
||||
#ifndef NANOSECOND_PER_SECOND
|
||||
#define NANOSECOND_PER_SECOND 1000000000UL
|
||||
#endif
|
||||
|
||||
#define MILLISECOND_PER_TICK (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND)
|
||||
#define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND)
|
||||
#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND)
|
||||
|
||||
|
||||
struct timeval _timevalue = {0};
|
||||
static void libc_system_time_init()
|
||||
{
|
||||
time_t time;
|
||||
rt_tick_t tick;
|
||||
rt_device_t device;
|
||||
|
||||
time = 0;
|
||||
device = rt_device_find("rtc");
|
||||
if (device != RT_NULL)
|
||||
{
|
||||
/* get realtime seconds */
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
|
||||
}
|
||||
|
||||
/* get tick */
|
||||
tick = rt_tick_get();
|
||||
|
||||
_timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
|
||||
_timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1;
|
||||
}
|
||||
|
||||
int libc_get_time(struct timespec *time)
|
||||
{
|
||||
rt_tick_t tick;
|
||||
static rt_bool_t inited = 0;
|
||||
|
||||
RT_ASSERT(time != RT_NULL);
|
||||
|
||||
/* initialize system time */
|
||||
if (inited == 0)
|
||||
{
|
||||
libc_system_time_init();
|
||||
inited = 1;
|
||||
}
|
||||
|
||||
/* get tick */
|
||||
tick = rt_tick_get();
|
||||
|
||||
time->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND;
|
||||
time->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * NANOSECOND_PER_TICK) * 1000;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
_gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
|
||||
{
|
||||
|
@ -190,6 +254,30 @@ _gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
|
|||
ptr->_errno = ENOTSUP;
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
/* POSIX thread provides clock_gettime function */
|
||||
#include <time.h>
|
||||
int
|
||||
_gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
|
||||
{
|
||||
struct timespec tp;
|
||||
|
||||
if (clock_gettime(CLOCK_REALTIME, &tp) == 0)
|
||||
{
|
||||
if (__tp != RT_NULL)
|
||||
{
|
||||
__tp->tv_sec = tp.tv_sec;
|
||||
__tp->tv_usec = tp.tv_nsec * 1000UL;
|
||||
}
|
||||
|
||||
return tp.tv_sec;
|
||||
}
|
||||
|
||||
/* return "not supported" */
|
||||
ptr->_errno = ENOTSUP;
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Memory routine */
|
||||
void *
|
||||
|
|
Loading…
Reference in New Issue