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

[Libc][dlib][armlibc] add gmtime_r api

This commit is contained in:
zylx 2018-10-26 11:03:55 +08:00
parent 86ad69032f
commit 3bf68f2f42
6 changed files with 150 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/libc/compilers/armlibc/sys/time.h
View File

@ -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
}

74
components/libc/compilers/armlibc/time.c
View File

@ -9,6 +9,27 @@
#include <sys/time.h>
#include <rtthread.h>
/* 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();

1
components/libc/compilers/dlib/sys/time.h
View File

@ -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
}

74
components/libc/compilers/dlib/time.c
View File

@ -9,6 +9,27 @@
#include <sys/time.h>
#include <rtthread.h>
/* 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();

1
include/rtthread.h
View File

@ -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);

62
src/kservice.c
View File

@ -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