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

[libc][time] 修复posix相关函数没有进行临界区保护的问题

This commit is contained in:
Meco Man 2021-07-22 01:40:37 +08:00
parent 4ce6b2f5de
commit 19c5088bb8
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
#include "sys/time.h" #include "sys/time.h"
#include <sys/errno.h> #include <sys/errno.h>
#include <rtthread.h> #include <rtthread.h>
#include <rthw.h>
#ifdef RT_USING_DEVICE #ifdef RT_USING_DEVICE
#include <rtdevice.h> #include <rtdevice.h>
#endif #endif
@ -470,6 +470,7 @@ RTM_EXPORT(strftime);
static volatile struct timeval _timevalue; static volatile struct timeval _timevalue;
static int _rt_clock_time_system_init() static int _rt_clock_time_system_init()
{ {
register rt_base_t level;
time_t time = 0; time_t time = 0;
rt_tick_t tick; rt_tick_t tick;
rt_device_t device; rt_device_t device;
@ -480,16 +481,20 @@ static int _rt_clock_time_system_init()
/* get realtime seconds */ /* get realtime seconds */
if(rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time) == RT_EOK) if(rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time) == RT_EOK)
{ {
/* get tick */ level = rt_hw_interrupt_disable();
tick = rt_tick_get(); tick = rt_tick_get(); /* get tick */
_timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; _timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
_timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1; _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1;
rt_hw_interrupt_enable(level);
return 0; return 0;
} }
} }
level = rt_hw_interrupt_disable();
_timevalue.tv_usec = 0; _timevalue.tv_usec = 0;
_timevalue.tv_sec = 0; _timevalue.tv_sec = 0;
rt_hw_interrupt_enable(level);
return -1; return -1;
} }
INIT_COMPONENT_EXPORT(_rt_clock_time_system_init); INIT_COMPONENT_EXPORT(_rt_clock_time_system_init);
@ -552,11 +557,14 @@ int clock_gettime(clockid_t clockid, struct timespec *tp)
{ {
case CLOCK_REALTIME: case CLOCK_REALTIME:
{ {
/* get tick */ int tick;
int tick = rt_tick_get(); register rt_base_t level;
level = rt_hw_interrupt_disable();
tick = rt_tick_get(); /* get tick */
tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND; tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND;
tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000; tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000;
rt_hw_interrupt_enable(level);
} }
break; break;
@ -590,6 +598,7 @@ int clock_settime(clockid_t clockid, const struct timespec *tp)
LOG_W("Cannot find a RTC device to save time!"); LOG_W("Cannot find a RTC device to save time!");
return -1; return -1;
#else #else
register rt_base_t level;
int second; int second;
rt_tick_t tick; rt_tick_t tick;
rt_device_t device; rt_device_t device;
@ -602,12 +611,13 @@ int clock_settime(clockid_t clockid, const struct timespec *tp)
/* get second */ /* get second */
second = tp->tv_sec; second = tp->tv_sec;
/* get tick */
tick = rt_tick_get();
level = rt_hw_interrupt_disable();
tick = rt_tick_get(); /* get tick */
/* update timevalue */ /* update timevalue */
_timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
_timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1; _timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1;
rt_hw_interrupt_enable(level);
/* update for RTC device */ /* update for RTC device */
device = rt_device_find("rtc"); device = rt_device_find("rtc");
@ -666,8 +676,6 @@ RTM_EXPORT(rt_timespec_to_tick);
#define RT_LIBC_DEFAULT_TIMEZONE 8 #define RT_LIBC_DEFAULT_TIMEZONE 8
#endif #endif
#include <rthw.h>
static volatile 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) void rt_tz_set(rt_int8_t tz)
@ -680,14 +688,7 @@ void rt_tz_set(rt_int8_t tz)
rt_int8_t rt_tz_get(void) rt_int8_t rt_tz_get(void)
{ {
rt_int8_t tz; return rt_current_timezone;
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) rt_int8_t rt_tz_is_dst(void)