From ab5f1d49ce03e520427c7909eda16fdf5ff66ed2 Mon Sep 17 00:00:00 2001 From: zylx Date: Wed, 24 Oct 2018 11:11:17 +0800 Subject: [PATCH 1/4] [kernel][kservice] add rt_gmtime_r api --- include/rtthread.h | 1 + src/kservice.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/include/rtthread.h b/include/rtthread.h index fc5029a220..254da139ea 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -473,6 +473,7 @@ rt_int32_t rt_vsprintf(char *dest, const char *format, va_list arg_ptr); rt_int32_t rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args); rt_int32_t rt_sprintf(char *buf, const char *format, ...); rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *format, ...); +struct tm *rt_gmtime_r(const time_t *timep, struct tm *result); #if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE) rt_device_t rt_console_set_device(const char *name); diff --git a/src/kservice.c b/src/kservice.c index dbc4a2fb0e..0a60fa0142 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1177,6 +1177,61 @@ void rt_kprintf(const char *fmt, ...) RTM_EXPORT(rt_kprintf); #endif +struct tm *rt_gmtime_r(const time_t *timep, struct tm *result) +{ +#define IS_LEAP_YEAR(year) (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) + + const rt_uint32_t mon_table[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + rt_uint32_t year = 1970, month = 0; + rt_uint32_t daycount = 0, second = 0, number = 0; + + second = *timep % (24 * 60 * 60); + result->tm_hour = second / 3600; + result->tm_min = (second % 3600) / 60; + result->tm_sec = (second % 3600) % 60; + + daycount = *timep / (24 * 60 * 60); + result->tm_wday = (daycount + 4) % 7; + if (daycount != 0) + { + while (daycount >= 365) + { + number = IS_LEAP_YEAR(year) ? 366 : 365; + if (daycount >= number) + { + daycount -= number; + year++; + } + else + break; + } + result->tm_year = year - 1900; + + while (daycount >= 28) + { + if (month == 1 && IS_LEAP_YEAR(year)) + { + if (daycount >= 29) + daycount -= 29; + else + break; + } + else + { + if (daycount >= mon_table[month]) + daycount -= mon_table[month]; + else + break; + } + month++; + } + result->tm_mon = month + 1; + result->tm_mday = daycount + 1; + } + return result; +} +RTM_EXPORT(rt_gmtime_r); + #ifdef RT_USING_HEAP /** * This function allocates a memory block, which address is aligned to the From 86ad69032f7cfa0c9666a9b6ee35358c29362470 Mon Sep 17 00:00:00 2001 From: zylx Date: Wed, 24 Oct 2018 11:58:33 +0800 Subject: [PATCH 2/4] [kernel][kservice] add comment --- src/kservice.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kservice.c b/src/kservice.c index 0a60fa0142..d920e52323 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1177,6 +1177,12 @@ void rt_kprintf(const char *fmt, ...) RTM_EXPORT(rt_kprintf); #endif +/** + * This function will convert Time (Restartable) + * + * @param timep the timestamp + * @param result the structure to stores information + */ struct tm *rt_gmtime_r(const time_t *timep, struct tm *result) { #define IS_LEAP_YEAR(year) (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) @@ -1206,6 +1212,7 @@ struct tm *rt_gmtime_r(const time_t *timep, struct tm *result) break; } result->tm_year = year - 1900; + result->tm_yday = daycount; while (daycount >= 28) { @@ -1225,7 +1232,7 @@ struct tm *rt_gmtime_r(const time_t *timep, struct tm *result) } month++; } - result->tm_mon = month + 1; + result->tm_mon = month; result->tm_mday = daycount + 1; } return result; From 3bf68f2f423c877e58d9f28e772c0fe484e025ea Mon Sep 17 00:00:00 2001 From: zylx Date: Fri, 26 Oct 2018 11:03:55 +0800 Subject: [PATCH 3/4] [Libc][dlib][armlibc] add gmtime_r api --- components/libc/compilers/armlibc/sys/time.h | 1 + components/libc/compilers/armlibc/time.c | 74 ++++++++++++++++++++ components/libc/compilers/dlib/sys/time.h | 1 + components/libc/compilers/dlib/time.c | 74 ++++++++++++++++++++ include/rtthread.h | 1 - src/kservice.c | 62 ---------------- 6 files changed, 150 insertions(+), 63 deletions(-) diff --git a/components/libc/compilers/armlibc/sys/time.h b/components/libc/compilers/armlibc/sys/time.h index e5751cfa3d..bac122e183 100644 --- a/components/libc/compilers/armlibc/sys/time.h +++ b/components/libc/compilers/armlibc/sys/time.h @@ -45,6 +45,7 @@ struct timezone { }; int gettimeofday(struct timeval *tp, void *ignore); +struct tm *gmtime_r(const time_t *timep, struct tm *r); #ifdef __cplusplus } diff --git a/components/libc/compilers/armlibc/time.c b/components/libc/compilers/armlibc/time.c index 29c5c6cdd2..5d151fb301 100644 --- a/components/libc/compilers/armlibc/time.c +++ b/components/libc/compilers/armlibc/time.c @@ -9,6 +9,27 @@ #include #include +/* days per month -- nonleap! */ +const short __spm[13] = +{ + 0, + (31), + (31 + 28), + (31 + 28 + 31), + (31 + 28 + 31 + 30), + (31 + 28 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), +}; + +/* seconds per day */ +#define SPD 24*60*60 + #ifdef RT_USING_DEVICE int gettimeofday(struct timeval *tp, void *ignore) { @@ -79,6 +100,59 @@ time_t time(time_t *t) return time_now; } +static int __isleap(int year) +{ + /* every fourth year is a leap year except for century years that are + * not divisible by 400. */ + /* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */ + return (!(year % 4) && ((year % 100) || !(year % 400))); +} + +/** + * This function will convert Time (Restartable) + * + * @param timep the timestamp + * @param the structure to stores information + * + * @return the structure to stores information + * + */ +struct tm *gmtime_r(const time_t *timep, struct tm *r) +{ + time_t i; + register time_t work = *timep % (SPD); + r->tm_sec = work % 60; + work /= 60; + r->tm_min = work % 60; + r->tm_hour = work / 60; + work = *timep / (SPD); + r->tm_wday = (4 + work) % 7; + for (i = 1970;; ++i) + { + register time_t k = __isleap(i) ? 366 : 365; + if (work >= k) + work -= k; + else + break; + } + r->tm_year = i - 1900; + r->tm_yday = work; + + r->tm_mday = 1; + if (__isleap(i) && (work > 58)) + { + if (work == 59) + r->tm_mday = 2; /* 29.2. */ + work -= 1; + } + + for (i = 11; i && (__spm[i] > work); --i) + ; + r->tm_mon = i; + r->tm_mday += work - __spm[i]; + return r; +} + RT_WEAK clock_t clock(void) { return rt_tick_get(); diff --git a/components/libc/compilers/dlib/sys/time.h b/components/libc/compilers/dlib/sys/time.h index 766d219faf..baf566936b 100644 --- a/components/libc/compilers/dlib/sys/time.h +++ b/components/libc/compilers/dlib/sys/time.h @@ -52,6 +52,7 @@ struct timezone { }; int gettimeofday(struct timeval *tp, void *ignore); +struct tm *gmtime_r(const time_t *timep, struct tm *r); #ifdef __cplusplus } diff --git a/components/libc/compilers/dlib/time.c b/components/libc/compilers/dlib/time.c index 12c7f893e9..88a61fab91 100644 --- a/components/libc/compilers/dlib/time.c +++ b/components/libc/compilers/dlib/time.c @@ -9,6 +9,27 @@ #include #include +/* days per month -- nonleap! */ +const short __spm[13] = +{ + 0, + (31), + (31 + 28), + (31 + 28 + 31), + (31 + 28 + 31 + 30), + (31 + 28 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), +}; + +/* seconds per day */ +#define SPD 24*60*60 + #ifdef RT_USING_DEVICE int gettimeofday(struct timeval *tp, void *ignore) { @@ -78,6 +99,59 @@ __time32_t __time32(__time32_t *t) return time_now; } +static int __isleap(int year) +{ + /* every fourth year is a leap year except for century years that are + * not divisible by 400. */ + /* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */ + return (!(year % 4) && ((year % 100) || !(year % 400))); +} + +/** + * This function will convert Time (Restartable) + * + * @param timep the timestamp + * @param the structure to stores information + * + * @return the structure to stores information + * + */ +struct tm *gmtime_r(const time_t *timep, struct tm *r) +{ + time_t i; + register time_t work = *timep % (SPD); + r->tm_sec = work % 60; + work /= 60; + r->tm_min = work % 60; + r->tm_hour = work / 60; + work = *timep / (SPD); + r->tm_wday = (4 + work) % 7; + for (i = 1970;; ++i) + { + register time_t k = __isleap(i) ? 366 : 365; + if (work >= k) + work -= k; + else + break; + } + r->tm_year = i - 1900; + r->tm_yday = work; + + r->tm_mday = 1; + if (__isleap(i) && (work > 58)) + { + if (work == 59) + r->tm_mday = 2; /* 29.2. */ + work -= 1; + } + + for (i = 11; i && (__spm[i] > work); --i) + ; + r->tm_mon = i; + r->tm_mday += work - __spm[i]; + return r; +} + RT_WEAK clock_t clock(void) { return rt_tick_get(); diff --git a/include/rtthread.h b/include/rtthread.h index 254da139ea..fc5029a220 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -473,7 +473,6 @@ rt_int32_t rt_vsprintf(char *dest, const char *format, va_list arg_ptr); rt_int32_t rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args); rt_int32_t rt_sprintf(char *buf, const char *format, ...); rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *format, ...); -struct tm *rt_gmtime_r(const time_t *timep, struct tm *result); #if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE) rt_device_t rt_console_set_device(const char *name); diff --git a/src/kservice.c b/src/kservice.c index d920e52323..dbc4a2fb0e 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -1177,68 +1177,6 @@ void rt_kprintf(const char *fmt, ...) RTM_EXPORT(rt_kprintf); #endif -/** - * This function will convert Time (Restartable) - * - * @param timep the timestamp - * @param result the structure to stores information - */ -struct tm *rt_gmtime_r(const time_t *timep, struct tm *result) -{ -#define IS_LEAP_YEAR(year) (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) - - const rt_uint32_t mon_table[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - rt_uint32_t year = 1970, month = 0; - rt_uint32_t daycount = 0, second = 0, number = 0; - - second = *timep % (24 * 60 * 60); - result->tm_hour = second / 3600; - result->tm_min = (second % 3600) / 60; - result->tm_sec = (second % 3600) % 60; - - daycount = *timep / (24 * 60 * 60); - result->tm_wday = (daycount + 4) % 7; - if (daycount != 0) - { - while (daycount >= 365) - { - number = IS_LEAP_YEAR(year) ? 366 : 365; - if (daycount >= number) - { - daycount -= number; - year++; - } - else - break; - } - result->tm_year = year - 1900; - result->tm_yday = daycount; - - while (daycount >= 28) - { - if (month == 1 && IS_LEAP_YEAR(year)) - { - if (daycount >= 29) - daycount -= 29; - else - break; - } - else - { - if (daycount >= mon_table[month]) - daycount -= mon_table[month]; - else - break; - } - month++; - } - result->tm_mon = month; - result->tm_mday = daycount + 1; - } - return result; -} -RTM_EXPORT(rt_gmtime_r); - #ifdef RT_USING_HEAP /** * This function allocates a memory block, which address is aligned to the From 920d6ecec72582263064163da16dbcdae84b325b Mon Sep 17 00:00:00 2001 From: zylx Date: Fri, 26 Oct 2018 14:10:38 +0800 Subject: [PATCH 4/4] [Libc] move gmtime_r api to rt-thread\components\libc\compilers\common --- components/libc/compilers/armlibc/time.c | 74 ----------------- components/libc/compilers/common/SConscript | 12 +++ components/libc/compilers/common/gmtime_r.c | 88 +++++++++++++++++++++ components/libc/compilers/dlib/time.c | 74 ----------------- 4 files changed, 100 insertions(+), 148 deletions(-) create mode 100644 components/libc/compilers/common/SConscript create mode 100644 components/libc/compilers/common/gmtime_r.c diff --git a/components/libc/compilers/armlibc/time.c b/components/libc/compilers/armlibc/time.c index 5d151fb301..29c5c6cdd2 100644 --- a/components/libc/compilers/armlibc/time.c +++ b/components/libc/compilers/armlibc/time.c @@ -9,27 +9,6 @@ #include #include -/* days per month -- nonleap! */ -const short __spm[13] = -{ - 0, - (31), - (31 + 28), - (31 + 28 + 31), - (31 + 28 + 31 + 30), - (31 + 28 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), -}; - -/* seconds per day */ -#define SPD 24*60*60 - #ifdef RT_USING_DEVICE int gettimeofday(struct timeval *tp, void *ignore) { @@ -100,59 +79,6 @@ time_t time(time_t *t) return time_now; } -static int __isleap(int year) -{ - /* every fourth year is a leap year except for century years that are - * not divisible by 400. */ - /* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */ - return (!(year % 4) && ((year % 100) || !(year % 400))); -} - -/** - * This function will convert Time (Restartable) - * - * @param timep the timestamp - * @param the structure to stores information - * - * @return the structure to stores information - * - */ -struct tm *gmtime_r(const time_t *timep, struct tm *r) -{ - time_t i; - register time_t work = *timep % (SPD); - r->tm_sec = work % 60; - work /= 60; - r->tm_min = work % 60; - r->tm_hour = work / 60; - work = *timep / (SPD); - r->tm_wday = (4 + work) % 7; - for (i = 1970;; ++i) - { - register time_t k = __isleap(i) ? 366 : 365; - if (work >= k) - work -= k; - else - break; - } - r->tm_year = i - 1900; - r->tm_yday = work; - - r->tm_mday = 1; - if (__isleap(i) && (work > 58)) - { - if (work == 59) - r->tm_mday = 2; /* 29.2. */ - work -= 1; - } - - for (i = 11; i && (__spm[i] > work); --i) - ; - r->tm_mon = i; - r->tm_mday += work - __spm[i]; - return r; -} - RT_WEAK clock_t clock(void) { return rt_tick_get(); diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript new file mode 100644 index 0000000000..02bf49941d --- /dev/null +++ b/components/libc/compilers/common/SConscript @@ -0,0 +1,12 @@ +from building import * + +Import('rtconfig') + +src = Glob('*.c') +cwd = GetCurrentDir() +group = [] +CPPPATH = [cwd] + +group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH) + +Return('group') diff --git a/components/libc/compilers/common/gmtime_r.c b/components/libc/compilers/common/gmtime_r.c new file mode 100644 index 0000000000..dff251ab6c --- /dev/null +++ b/components/libc/compilers/common/gmtime_r.c @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2018-10-26 zylx first version + */ + +#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined (__IAR_SYSTEMS_ICC__) +#include + +/* seconds per day */ +#define SPD 24*60*60 + +/* days per month -- nonleap! */ +const short __spm[13] = +{ + 0, + (31), + (31 + 28), + (31 + 28 + 31), + (31 + 28 + 31 + 30), + (31 + 28 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30), + (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), +}; + +int __isleap(int year) +{ + /* every fourth year is a leap year except for century years that are + * not divisible by 400. */ + /* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */ + return (!(year % 4) && ((year % 100) || !(year % 400))); +} + +/** + * This function will convert Time (Restartable) + * + * @param timep the timestamp + * @param the structure to stores information + * + * @return the structure to stores information + * + */ +struct tm *gmtime_r(const time_t *timep, struct tm *r) +{ + time_t i; + register time_t work = *timep % (SPD); + r->tm_sec = work % 60; + work /= 60; + r->tm_min = work % 60; + r->tm_hour = work / 60; + work = *timep / (SPD); + r->tm_wday = (4 + work) % 7; + for (i = 1970;; ++i) + { + register time_t k = __isleap(i) ? 366 : 365; + if (work >= k) + work -= k; + else + break; + } + r->tm_year = i - 1900; + r->tm_yday = work; + + r->tm_mday = 1; + if (__isleap(i) && (work > 58)) + { + if (work == 59) + r->tm_mday = 2; /* 29.2. */ + work -= 1; + } + + for (i = 11; i && (__spm[i] > work); --i) + ; + r->tm_mon = i; + r->tm_mday += work - __spm[i]; + return r; +} +#endif /* end of __CC_ARM or __CLANG_ARM or __IAR_SYSTEMS_ICC__ */ + diff --git a/components/libc/compilers/dlib/time.c b/components/libc/compilers/dlib/time.c index 88a61fab91..12c7f893e9 100644 --- a/components/libc/compilers/dlib/time.c +++ b/components/libc/compilers/dlib/time.c @@ -9,27 +9,6 @@ #include #include -/* days per month -- nonleap! */ -const short __spm[13] = -{ - 0, - (31), - (31 + 28), - (31 + 28 + 31), - (31 + 28 + 31 + 30), - (31 + 28 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30), - (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), -}; - -/* seconds per day */ -#define SPD 24*60*60 - #ifdef RT_USING_DEVICE int gettimeofday(struct timeval *tp, void *ignore) { @@ -99,59 +78,6 @@ __time32_t __time32(__time32_t *t) return time_now; } -static int __isleap(int year) -{ - /* every fourth year is a leap year except for century years that are - * not divisible by 400. */ - /* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */ - return (!(year % 4) && ((year % 100) || !(year % 400))); -} - -/** - * This function will convert Time (Restartable) - * - * @param timep the timestamp - * @param the structure to stores information - * - * @return the structure to stores information - * - */ -struct tm *gmtime_r(const time_t *timep, struct tm *r) -{ - time_t i; - register time_t work = *timep % (SPD); - r->tm_sec = work % 60; - work /= 60; - r->tm_min = work % 60; - r->tm_hour = work / 60; - work = *timep / (SPD); - r->tm_wday = (4 + work) % 7; - for (i = 1970;; ++i) - { - register time_t k = __isleap(i) ? 366 : 365; - if (work >= k) - work -= k; - else - break; - } - r->tm_year = i - 1900; - r->tm_yday = work; - - r->tm_mday = 1; - if (__isleap(i) && (work > 58)) - { - if (work == 59) - r->tm_mday = 2; /* 29.2. */ - work -= 1; - } - - for (i = 11; i && (__spm[i] > work); --i) - ; - r->tm_mon = i; - r->tm_mday += work - __spm[i]; - return r; -} - RT_WEAK clock_t clock(void) { return rt_tick_get();