libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libc][time] 重命名非标准libc函数 并 调整time.h定义位置

Browse Source
This commit is contained in:
Meco Man 2021-07-22 00:35:08 +08:00
parent 0f48449b5e
commit 62ff77d493
6 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/libc/compilers/common/sys/time.h
View File

@ -19,6 +19,7 @@
extern "C" {
#endif
/* timezone */
#define DST_NONE 0 /* not on dst */
#define DST_USA 1 /* USA style dst */
#define DST_AUST 2 /* Australian style dst */
@ -31,12 +32,21 @@ extern "C" {
#define DST_TUR 9 /* Turkey */
#define DST_AUSTALT 10 /* Australian style with shift in 1986 */
#ifndef _TIMEVAL_DEFINED
#define _TIMEVAL_DEFINED
struct timezone {
int tz_minuteswest; /* minutes west of Greenwich */
int tz_dsttime; /* type of dst correction */
};
void rt_tz_set(rt_int8_t tz);
rt_int8_t rt_tz_get(void);
rt_int8_t rt_tz_is_dst(void);
/*
* Structure returned by gettimeofday(2) system call,
* and used in other calls.
*/
#ifndef _TIMEVAL_DEFINED
#define _TIMEVAL_DEFINED
#if !(defined(_WIN32))
struct timeval {
long tv_sec; /* seconds */
@ -45,18 +55,6 @@ struct timeval {
#endif
#endif /* _TIMEVAL_DEFINED */
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/) && !(defined(__ICCARM__) && (__VER__ >= 8010001)) && !defined(_WIN32)
struct timespec {
time_t tv_sec; /* seconds */
long tv_nsec; /* and nanoseconds */
};
#endif
struct timezone {
int tz_minuteswest; /* minutes west of Greenwich */
int tz_dsttime; /* type of dst correction */
};
int stime(const time_t *t);
time_t timegm(struct tm * const t);
int gettimeofday(struct timeval *tv, struct timezone *tz);
@ -67,6 +65,14 @@ struct tm *gmtime_r(const time_t *timep, struct tm *r);
#ifdef RT_USING_POSIX
#include <sys/types.h>
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/) && !(defined(__ICCARM__) && (__VER__ >= 8010001)) && !defined(_WIN32)
struct timespec {
time_t tv_sec; /* seconds */
long tv_nsec; /* and nanoseconds */
};
#endif
/* posix clock and timer */
#define MILLISECOND_PER_SECOND 1000UL
#define MICROSECOND_PER_SECOND 1000000UL
@ -96,15 +102,9 @@ struct tm *gmtime_r(const time_t *timep, struct tm *r);
int clock_getres (clockid_t clockid, struct timespec *res);
int clock_gettime (clockid_t clockid, struct timespec *tp);
int clock_settime (clockid_t clockid, const struct timespec *tp);
int clock_time_to_tick(const struct timespec *time);
int rt_timespec_to_tick(const struct timespec *time);
#endif /* RT_USING_POSIX */
/* timezone APIs (Not standard LIBC APIs) */
void rt_tz_set(rt_int8_t tz);
rt_int8_t rt_tz_get(void);
rt_int8_t rt_tz_is_dst(void);
#ifdef __cplusplus
}
#endif

23
components/libc/compilers/common/time.c
View File

@ -465,8 +465,8 @@ RTM_EXPORT(difftime);
RTM_EXPORT(strftime);
#ifdef RT_USING_POSIX
static struct timeval _timevalue;
static int clock_time_system_init()
static volatile struct timeval _timevalue;
static int _rt_clock_time_system_init()
{
time_t time;
rt_tick_t tick;
@ -493,7 +493,7 @@ static int clock_time_system_init()
return 0;
}
INIT_COMPONENT_EXPORT(clock_time_system_init);
INIT_COMPONENT_EXPORT(_rt_clock_time_system_init);
int clock_getres(clockid_t clockid, struct timespec *res)
{
@ -614,7 +614,7 @@ int clock_settime(clockid_t clockid, const struct timespec *tp)
}
RTM_EXPORT(clock_settime);
int clock_time_to_tick(const struct timespec *time)
int rt_timespec_to_tick(const struct timespec *time)
{
int tick;
int nsecond, second;
@ -645,19 +645,19 @@ int clock_time_to_tick(const struct timespec *time)
return tick;
}
RTM_EXPORT(clock_time_to_tick);
RTM_EXPORT(rt_timespec_to_tick);
#endif /* RT_USING_POSIX */
/* timezone APIs (Not standard LIBC APIs) */
/* timezone */
#ifndef RT_LIBC_DEFAULT_TIMEZONE
#define RT_LIBC_DEFAULT_TIMEZONE 8
#endif
#include <rthw.h>
volatile static rt_int8_t rt_current_timezone = RT_LIBC_DEFAULT_TIMEZONE;
static volatile rt_int8_t rt_current_timezone = RT_LIBC_DEFAULT_TIMEZONE;
void rt_tz_set(rt_int8_t tz)
{
@ -669,7 +669,14 @@ void rt_tz_set(rt_int8_t tz)
rt_int8_t rt_tz_get(void)
{
return rt_current_timezone;
rt_int8_t tz;
register rt_base_t level;
level = rt_hw_interrupt_disable();
tz = rt_current_timezone;
rt_hw_interrupt_enable(level);
return tz;
}
rt_int8_t rt_tz_is_dst(void)

2
components/libc/pthreads/mqueue.c
View File

@ -243,7 +243,7 @@ ssize_t mq_timedreceive(mqd_t mqdes,
return -1;
}
tick = clock_time_to_tick(abs_timeout);
tick = rt_timespec_to_tick(abs_timeout);
result = rt_mq_recv(mqdes->mq, msg_ptr, msg_len, tick);
if (result == RT_EOK)

2
components/libc/pthreads/pthread_cond.c
View File

@ -222,7 +222,7 @@ int pthread_cond_timedwait(pthread_cond_t *cond,
int timeout;
rt_err_t result;
timeout = clock_time_to_tick(abstime);
timeout = rt_timespec_to_tick(abstime);
result = _pthread_cond_timedwait(cond, mutex, timeout);
if (result == RT_EOK)
return 0;

2
components/libc/pthreads/semaphore.c
View File

@ -319,7 +319,7 @@ int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout)
return EINVAL;
/* calculate os tick */
tick = clock_time_to_tick(abs_timeout);
tick = rt_timespec_to_tick(abs_timeout);
result = rt_sem_take(sem->sem, tick);
if (result == -RT_ETIMEOUT)

2
components/libc/signal/posix_signal.c
View File

@ -83,7 +83,7 @@ int sigtimedwait(const sigset_t *set, siginfo_t *info,
if (timeout)
{
extern int clock_time_to_tick(const struct timespec *time);
tick = clock_time_to_tick(timeout);
tick = rt_timespec_to_tick(timeout);
}
#endif