yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!487 解决gmtime和localtime接口由于g_tm全局变量导致的竞态问题 

Merge pull request !487 from JerryH/cherry-pick-1640159938
This commit is contained in:
openharmony_ci 2021-12-22 08:47:05 +00:00 committed by Gitee
parent 07ef35ccdf 0a1df72f7e
commit b5db6ee2d4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kal/posix/src/time.c
View File

@ -63,9 +63,6 @@ STATIC const UINT8 g_montbl[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30,
*/ */
long timezone = -8 * 60 * 60; // defaults to CST: 8 hours east of the Prime Meridian long timezone = -8 * 60 * 60; // defaults to CST: 8 hours east of the Prime Meridian
/* internal shared struct tm object for localtime and gmtime */
static struct tm g_tm;
int nanosleep(const struct timespec *rqtp, struct timespec *rmtp) int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
{ {
UINT64 nseconds; UINT64 nseconds;
@ -508,7 +505,8 @@ struct tm *gmtime_r(const time_t *timep, struct tm *result)
struct tm *gmtime(const time_t *timer) struct tm *gmtime(const time_t *timer)
{ {
return gmtime_r(timer, &g_tm); static struct tm tm;
return gmtime_r(timer, &tm);
} }
struct tm *localtime_r(const time_t *timep, struct tm *result) struct tm *localtime_r(const time_t *timep, struct tm *result)
@ -526,7 +524,8 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
struct tm *localtime(const time_t *timer) struct tm *localtime(const time_t *timer)
{ {
return localtime_r(timer, &g_tm); static struct tm tm;
return localtime_r(timer, &tm);
} }
static time_t ConvertUtc2Secs(struct tm *tm) static time_t ConvertUtc2Secs(struct tm *tm)