Kouhei Sutou
null+****@clear*****
Thu May 5 21:15:57 JST 2016
Kouhei Sutou 2016-05-05 21:15:57 +0900 (Thu, 05 May 2016) New Revision: a777628c3ebff2b0bb29278e860e94fb69ba2e2e https://github.com/groonga/groonga/commit/a777628c3ebff2b0bb29278e860e94fb69ba2e2e Message: Extract time related functions Added files: lib/grn_time.h lib/time.c Modified files: lib/ctx.c lib/grn_ctx.h lib/sources.am Modified: lib/ctx.c (+0 -154) =================================================================== --- lib/ctx.c 2016-05-05 21:15:05 +0900 (0b5bdb5) +++ lib/ctx.c 2016-05-05 21:15:57 +0900 (c5550ab) @@ -52,14 +52,6 @@ # include <netinet/in.h> #endif /* WIN32 */ -#if defined(HAVE__LOCALTIME64_S) && defined(__GNUC__) -# ifdef _WIN64 -# define localtime_s(tm, time) _localtime64_s(tm, time) -# else /* _WIN64 */ -# define localtime_s(tm, time) _localtime32_s(tm, time) -# endif /* _WIN64 */ -#endif /* defined(HAVE__LOCALTIME64_S) && defined(__GNUC__) */ - #define GRN_CTX_INITIALIZER(enc) \ { GRN_SUCCESS, 0, enc, 0, GRN_LOG_NOTICE,\ GRN_CTX_FIN, 0, 0, 0, 0, {0}, NULL, NULL, NULL, NULL, NULL } @@ -141,152 +133,6 @@ grn_nanosleep(uint64_t nanoseconds) #endif // WIN32 } -/* fixme by 2038 */ - -grn_rc -grn_timeval_now(grn_ctx *ctx, grn_timeval *tv) -{ -#ifdef HAVE_CLOCK_GETTIME - struct timespec t; - if (clock_gettime(CLOCK_REALTIME, &t)) { - SERR("clock_gettime"); - } else { - tv->tv_sec = t.tv_sec; - tv->tv_nsec = t.tv_nsec; - } - return ctx->rc; -#else /* HAVE_CLOCK_GETTIME */ -#ifdef WIN32 - time_t t; - struct _timeb tb; - time(&t); - _ftime(&tb); - tv->tv_sec = t; - tv->tv_nsec = tb.millitm * (GRN_TIME_NSEC_PER_SEC / 1000); - return GRN_SUCCESS; -#else /* WIN32 */ - struct timeval t; - if (gettimeofday(&t, NULL)) { - SERR("gettimeofday"); - } else { - tv->tv_sec = t.tv_sec; - tv->tv_nsec = GRN_TIME_USEC_TO_NSEC(t.tv_usec); - } - return ctx->rc; -#endif /* WIN32 */ -#endif /* HAVE_CLOCK_GETTIME */ -} - -void -grn_time_now(grn_ctx *ctx, grn_obj *obj) -{ - grn_timeval tv; - grn_timeval_now(ctx, &tv); - GRN_TIME_SET(ctx, obj, GRN_TIME_PACK(tv.tv_sec, - GRN_TIME_NSEC_TO_USEC(tv.tv_nsec))); -} - -struct tm * -grn_timeval2tm(grn_ctx *ctx, grn_timeval *tv, struct tm *tm_buffer) -{ - struct tm *ltm; - const char *function_name; -#ifdef HAVE__LOCALTIME64_S - time_t t = tv->tv_sec; - function_name = "localtime_s"; - ltm = (localtime_s(tm_buffer, &t) == 0) ? tm_buffer : NULL; -#else /* HAVE__LOCALTIME64_S */ -# ifdef HAVE_LOCALTIME_R - time_t t = tv->tv_sec; - function_name = "localtime_r"; - ltm = localtime_r(&t, tm_buffer); -# else /* HAVE_LOCALTIME_R */ - time_t tvsec = (time_t) tv->tv_sec; - function_name = "localtime"; - ltm = localtime(&tvsec); -# endif /* HAVE_LOCALTIME_R */ -#endif /* HAVE__LOCALTIME64_S */ - if (!ltm) { - SERR("%s", function_name); - } - return ltm; -} - -grn_rc -grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf, size_t buf_size) -{ - struct tm tm; - struct tm *ltm; - ltm = grn_timeval2tm(ctx, tv, &tm); - grn_snprintf(buf, buf_size, GRN_TIMEVAL_STR_SIZE, - GRN_TIMEVAL_STR_FORMAT, - ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday, - ltm->tm_hour, ltm->tm_min, ltm->tm_sec, - (int)(GRN_TIME_NSEC_TO_USEC(tv->tv_nsec))); - if (buf_size > GRN_TIMEVAL_STR_SIZE) { - buf[GRN_TIMEVAL_STR_SIZE - 1] = '\0'; - } else { - buf[buf_size - 1] = '\0'; - } - return ctx->rc; -} - -grn_rc -grn_str2timeval(const char *str, uint32_t str_len, grn_timeval *tv) -{ - struct tm tm; - const char *r1, *r2, *rend = str + str_len; - uint32_t uv; - memset(&tm, 0, sizeof(struct tm)); - - tm.tm_year = (int)grn_atoui(str, rend, &r1) - 1900; - if ((r1 + 1) >= rend || (*r1 != '/' && *r1 != '-')) { - return GRN_INVALID_ARGUMENT; - } - r1++; - tm.tm_mon = (int)grn_atoui(r1, rend, &r1) - 1; - if ((r1 + 1) >= rend || (*r1 != '/' && *r1 != '-') || - tm.tm_mon < 0 || tm.tm_mon >= 12) { return GRN_INVALID_ARGUMENT; } - r1++; - tm.tm_mday = (int)grn_atoui(r1, rend, &r1); - if ((r1 + 1) >= rend || *r1 != ' ' || - tm.tm_mday < 1 || tm.tm_mday > 31) { return GRN_INVALID_ARGUMENT; } - - tm.tm_hour = (int)grn_atoui(++r1, rend, &r2); - if ((r2 + 1) >= rend || r1 == r2 || *r2 != ':' || - tm.tm_hour < 0 || tm.tm_hour >= 24) { - return GRN_INVALID_ARGUMENT; - } - r1 = r2 + 1; - tm.tm_min = (int)grn_atoui(r1, rend, &r2); - if ((r2 + 1) >= rend || r1 == r2 || *r2 != ':' || - tm.tm_min < 0 || tm.tm_min >= 60) { - return GRN_INVALID_ARGUMENT; - } - r1 = r2 + 1; - tm.tm_sec = (int)grn_atoui(r1, rend, &r2); - if (r1 == r2 || - tm.tm_sec < 0 || tm.tm_sec > 61 /* leap 2sec */) { - return GRN_INVALID_ARGUMENT; - } - r1 = r2; - tm.tm_yday = -1; - tm.tm_isdst = -1; - - /* tm_yday is set appropriately (0-365) on successful completion. */ - tv->tv_sec = mktime(&tm); - if (tm.tm_yday == -1) { return GRN_INVALID_ARGUMENT; } - if ((r1 + 1) < rend && *r1 == '.') { r1++; } - uv = grn_atoi(r1, rend, &r2); - while (r2 < r1 + 6) { - uv *= 10; - r2++; - } - if (uv >= GRN_TIME_USEC_PER_SEC) { return GRN_INVALID_ARGUMENT; } - tv->tv_nsec = GRN_TIME_USEC_TO_NSEC(uv); - return GRN_SUCCESS; -} - const char * grn_get_global_error_message(void) { Modified: lib/grn_ctx.h (+1 -27) =================================================================== --- lib/grn_ctx.h 2016-05-05 21:15:05 +0900 (48b023f) +++ lib/grn_ctx.h 2016-05-05 21:15:57 +0900 (2ebafb1) @@ -34,6 +34,7 @@ #include "grn_io.h" #include "grn_alloc.h" +#include "grn_time.h" #ifdef __cplusplus extern "C" { @@ -424,35 +425,8 @@ extern int grn_lock_timeout; #define GRN_CTX_ALLOCATED (0x80) #define GRN_CTX_TEMPORARY_DISABLE_II_RESOLVE_SEL_AND (0x40) -typedef struct { - int64_t tv_sec; - int32_t tv_nsec; -} grn_timeval; - extern grn_timeval grn_starttime; -#ifndef GRN_TIMEVAL_STR_SIZE -#define GRN_TIMEVAL_STR_SIZE 0x100 -#endif /* GRN_TIMEVAL_STR_SIZE */ -#ifndef GRN_TIMEVAL_STR_FORMAT -#define GRN_TIMEVAL_STR_FORMAT "%04d-%02d-%02d %02d:%02d:%02d.%06d" -#endif /* GRN_TIMEVAL_STR_FORMAT */ -#define GRN_TIMEVAL_TO_MSEC(timeval) \ - (((timeval)->tv_sec * GRN_TIME_MSEC_PER_SEC) + \ - ((timeval)->tv_nsec / GRN_TIME_NSEC_PER_MSEC)) -#define GRN_TIME_NSEC_PER_SEC 1000000000 -#define GRN_TIME_NSEC_PER_SEC_F 1000000000.0 -#define GRN_TIME_NSEC_PER_MSEC 1000000 -#define GRN_TIME_NSEC_PER_USEC (GRN_TIME_NSEC_PER_SEC / GRN_TIME_USEC_PER_SEC) -#define GRN_TIME_MSEC_PER_SEC 1000 -#define GRN_TIME_NSEC_TO_USEC(nsec) ((nsec) / GRN_TIME_NSEC_PER_USEC) -#define GRN_TIME_USEC_TO_NSEC(usec) ((usec) * GRN_TIME_NSEC_PER_USEC) - -GRN_API grn_rc grn_timeval_now(grn_ctx *ctx, grn_timeval *tv); -GRN_API grn_rc grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf, size_t buf_size); -struct tm *grn_timeval2tm(grn_ctx *ctx, grn_timeval *tv, struct tm *tm_buffer); -grn_rc grn_str2timeval(const char *str, uint32_t str_len, grn_timeval *tv); - GRN_API void grn_ctx_log(grn_ctx *ctx, const char *fmt, ...) GRN_ATTRIBUTE_PRINTF(2); void grn_ctx_loader_clear(grn_ctx *ctx); void grn_log_reopen(grn_ctx *ctx); Added: lib/grn_time.h (+56 -0) 100644 =================================================================== --- /dev/null +++ lib/grn_time.h 2016-05-05 21:15:57 +0900 (363e3c8) @@ -0,0 +1,56 @@ +/* -*- c-basic-offset: 2 -*- */ +/* + Copyright(C) 2009-2016 Brazil + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#pragma once + +#include "grn.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + int64_t tv_sec; + int32_t tv_nsec; +} grn_timeval; + +#ifndef GRN_TIMEVAL_STR_SIZE +#define GRN_TIMEVAL_STR_SIZE 0x100 +#endif /* GRN_TIMEVAL_STR_SIZE */ +#ifndef GRN_TIMEVAL_STR_FORMAT +#define GRN_TIMEVAL_STR_FORMAT "%04d-%02d-%02d %02d:%02d:%02d.%06d" +#endif /* GRN_TIMEVAL_STR_FORMAT */ +#define GRN_TIMEVAL_TO_MSEC(timeval) \ + (((timeval)->tv_sec * GRN_TIME_MSEC_PER_SEC) + \ + ((timeval)->tv_nsec / GRN_TIME_NSEC_PER_MSEC)) +#define GRN_TIME_NSEC_PER_SEC 1000000000 +#define GRN_TIME_NSEC_PER_SEC_F 1000000000.0 +#define GRN_TIME_NSEC_PER_MSEC 1000000 +#define GRN_TIME_NSEC_PER_USEC (GRN_TIME_NSEC_PER_SEC / GRN_TIME_USEC_PER_SEC) +#define GRN_TIME_MSEC_PER_SEC 1000 +#define GRN_TIME_NSEC_TO_USEC(nsec) ((nsec) / GRN_TIME_NSEC_PER_USEC) +#define GRN_TIME_USEC_TO_NSEC(usec) ((usec) * GRN_TIME_NSEC_PER_USEC) + +GRN_API grn_rc grn_timeval_now(grn_ctx *ctx, grn_timeval *tv); +GRN_API grn_rc grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf, size_t buf_size); +struct tm *grn_timeval2tm(grn_ctx *ctx, grn_timeval *tv, struct tm *tm_buffer); +grn_rc grn_str2timeval(const char *str, uint32_t str_len, grn_timeval *tv); + +#ifdef __cplusplus +} +#endif Modified: lib/sources.am (+2 -0) =================================================================== --- lib/sources.am 2016-05-05 21:15:05 +0900 (ec2c74d) +++ lib/sources.am 2016-05-05 21:15:57 +0900 (5c960d4) @@ -79,6 +79,8 @@ libgroonga_la_SOURCES = \ string.c \ grn_string.h \ thread.c \ + time.c \ + grn_time.h \ token_cursor.c \ grn_token_cursor.h \ tokenizer.c \ Added: lib/time.c (+178 -0) 100644 =================================================================== --- /dev/null +++ lib/time.c 2016-05-05 21:15:57 +0900 (bc2d7cb) @@ -0,0 +1,178 @@ +/* -*- c-basic-offset: 2 -*- */ +/* + Copyright(C) 2009-2016 Brazil + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "grn_time.h" +#include "grn_ctx.h" +#include "grn_str.h" + +#include <stdio.h> +#include <time.h> + +#if defined(HAVE__LOCALTIME64_S) && defined(__GNUC__) +# ifdef _WIN64 +# define localtime_s(tm, time) _localtime64_s(tm, time) +# else /* _WIN64 */ +# define localtime_s(tm, time) _localtime32_s(tm, time) +# endif /* _WIN64 */ +#endif /* defined(HAVE__LOCALTIME64_S) && defined(__GNUC__) */ + +/* fixme by 2038 */ + +grn_rc +grn_timeval_now(grn_ctx *ctx, grn_timeval *tv) +{ +#ifdef HAVE_CLOCK_GETTIME + struct timespec t; + if (clock_gettime(CLOCK_REALTIME, &t)) { + SERR("clock_gettime"); + } else { + tv->tv_sec = t.tv_sec; + tv->tv_nsec = t.tv_nsec; + } + return ctx->rc; +#else /* HAVE_CLOCK_GETTIME */ +#ifdef WIN32 + time_t t; + struct _timeb tb; + time(&t); + _ftime(&tb); + tv->tv_sec = t; + tv->tv_nsec = tb.millitm * (GRN_TIME_NSEC_PER_SEC / 1000); + return GRN_SUCCESS; +#else /* WIN32 */ + struct timeval t; + if (gettimeofday(&t, NULL)) { + SERR("gettimeofday"); + } else { + tv->tv_sec = t.tv_sec; + tv->tv_nsec = GRN_TIME_USEC_TO_NSEC(t.tv_usec); + } + return ctx->rc; +#endif /* WIN32 */ +#endif /* HAVE_CLOCK_GETTIME */ +} + +void +grn_time_now(grn_ctx *ctx, grn_obj *obj) +{ + grn_timeval tv; + grn_timeval_now(ctx, &tv); + GRN_TIME_SET(ctx, obj, GRN_TIME_PACK(tv.tv_sec, + GRN_TIME_NSEC_TO_USEC(tv.tv_nsec))); +} + +struct tm * +grn_timeval2tm(grn_ctx *ctx, grn_timeval *tv, struct tm *tm_buffer) +{ + struct tm *ltm; + const char *function_name; +#ifdef HAVE__LOCALTIME64_S + time_t t = tv->tv_sec; + function_name = "localtime_s"; + ltm = (localtime_s(tm_buffer, &t) == 0) ? tm_buffer : NULL; +#else /* HAVE__LOCALTIME64_S */ +# ifdef HAVE_LOCALTIME_R + time_t t = tv->tv_sec; + function_name = "localtime_r"; + ltm = localtime_r(&t, tm_buffer); +# else /* HAVE_LOCALTIME_R */ + time_t tvsec = (time_t) tv->tv_sec; + function_name = "localtime"; + ltm = localtime(&tvsec); +# endif /* HAVE_LOCALTIME_R */ +#endif /* HAVE__LOCALTIME64_S */ + if (!ltm) { + SERR("%s", function_name); + } + return ltm; +} + +grn_rc +grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf, size_t buf_size) +{ + struct tm tm; + struct tm *ltm; + ltm = grn_timeval2tm(ctx, tv, &tm); + grn_snprintf(buf, buf_size, GRN_TIMEVAL_STR_SIZE, + GRN_TIMEVAL_STR_FORMAT, + ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday, + ltm->tm_hour, ltm->tm_min, ltm->tm_sec, + (int)(GRN_TIME_NSEC_TO_USEC(tv->tv_nsec))); + if (buf_size > GRN_TIMEVAL_STR_SIZE) { + buf[GRN_TIMEVAL_STR_SIZE - 1] = '\0'; + } else { + buf[buf_size - 1] = '\0'; + } + return ctx->rc; +} + +grn_rc +grn_str2timeval(const char *str, uint32_t str_len, grn_timeval *tv) +{ + struct tm tm; + const char *r1, *r2, *rend = str + str_len; + uint32_t uv; + memset(&tm, 0, sizeof(struct tm)); + + tm.tm_year = (int)grn_atoui(str, rend, &r1) - 1900; + if ((r1 + 1) >= rend || (*r1 != '/' && *r1 != '-')) { + return GRN_INVALID_ARGUMENT; + } + r1++; + tm.tm_mon = (int)grn_atoui(r1, rend, &r1) - 1; + if ((r1 + 1) >= rend || (*r1 != '/' && *r1 != '-') || + tm.tm_mon < 0 || tm.tm_mon >= 12) { return GRN_INVALID_ARGUMENT; } + r1++; + tm.tm_mday = (int)grn_atoui(r1, rend, &r1); + if ((r1 + 1) >= rend || *r1 != ' ' || + tm.tm_mday < 1 || tm.tm_mday > 31) { return GRN_INVALID_ARGUMENT; } + + tm.tm_hour = (int)grn_atoui(++r1, rend, &r2); + if ((r2 + 1) >= rend || r1 == r2 || *r2 != ':' || + tm.tm_hour < 0 || tm.tm_hour >= 24) { + return GRN_INVALID_ARGUMENT; + } + r1 = r2 + 1; + tm.tm_min = (int)grn_atoui(r1, rend, &r2); + if ((r2 + 1) >= rend || r1 == r2 || *r2 != ':' || + tm.tm_min < 0 || tm.tm_min >= 60) { + return GRN_INVALID_ARGUMENT; + } + r1 = r2 + 1; + tm.tm_sec = (int)grn_atoui(r1, rend, &r2); + if (r1 == r2 || + tm.tm_sec < 0 || tm.tm_sec > 61 /* leap 2sec */) { + return GRN_INVALID_ARGUMENT; + } + r1 = r2; + tm.tm_yday = -1; + tm.tm_isdst = -1; + + /* tm_yday is set appropriately (0-365) on successful completion. */ + tv->tv_sec = mktime(&tm); + if (tm.tm_yday == -1) { return GRN_INVALID_ARGUMENT; } + if ((r1 + 1) < rend && *r1 == '.') { r1++; } + uv = grn_atoi(r1, rend, &r2); + while (r2 < r1 + 6) { + uv *= 10; + r2++; + } + if (uv >= GRN_TIME_USEC_PER_SEC) { return GRN_INVALID_ARGUMENT; } + tv->tv_nsec = GRN_TIME_USEC_TO_NSEC(uv); + return GRN_SUCCESS; +} -------------- next part -------------- HTML����������������������������...下载
