From: Florian Forster Date: Fri, 16 Sep 2016 08:50:34 +0000 (+0200) Subject: Merge branch 'pr/1918' X-Git-Tag: collectd-5.7.0~77 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6f4f918d4d5e70c75471632254ecb9c55fd8d62f;hp=3e36ac34460b6be8388ac376ab7a4e2e990870ec;p=collectd.git Merge branch 'pr/1918' --- diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index f2443599..9d4b7918 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -5747,7 +5747,7 @@ values are made available through those parameters: =item B<$1> -The timestamp of the queried value as a floating point number. +The timestamp of the queried value as an RFC 3339-formatted local time. =item B<$2> diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c index 86476ea6..45828b34 100644 --- a/src/daemon/utils_time.c +++ b/src/daemon/utils_time.c @@ -54,10 +54,10 @@ cdtime_t cdtime (void) /* {{{ */ char errbuf[1024]; ERROR ("cdtime: clock_gettime failed: %s", sstrerror (errno, errbuf, sizeof (errbuf))); - return (0); + return 0; } - return (TIMESPEC_TO_CDTIME_T (&ts)); + return TIMESPEC_TO_CDTIME_T (&ts); } /* }}} cdtime_t cdtime */ # else /* !HAVE_CLOCK_GETTIME */ /* Work around for Mac OS X which doesn't have clock_gettime(2). *sigh* */ @@ -72,14 +72,64 @@ cdtime_t cdtime (void) /* {{{ */ char errbuf[1024]; ERROR ("cdtime: gettimeofday failed: %s", sstrerror (errno, errbuf, sizeof (errbuf))); - return (0); + return 0; } - return (TIMEVAL_TO_CDTIME_T (&tv)); + return TIMEVAL_TO_CDTIME_T (&tv); } /* }}} cdtime_t cdtime */ # endif #endif +/********************************************************************** + Time retrieval functions +***********************************************************************/ + +static int get_utc_time (cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */ +{ + struct timespec t_spec; + int status; + + CDTIME_T_TO_TIMESPEC (t, &t_spec); + NORMALIZE_TIMESPEC (t_spec); + + if (gmtime_r (&t_spec.tv_sec, t_tm) == NULL) { + char errbuf[1024]; + status = errno; + ERROR ("get_utc_time: gmtime_r failed: %s", + sstrerror (status, errbuf, sizeof (errbuf))); + return status; + } + + *nsec = t_spec.tv_nsec; + return 0; +} /* }}} int get_utc_time */ + +static int get_local_time (cdtime_t t, struct tm *t_tm, long *nsec) /* {{{ */ +{ + struct timespec t_spec; + int status; + + CDTIME_T_TO_TIMESPEC (t, &t_spec); + NORMALIZE_TIMESPEC (t_spec); + + if (localtime_r (&t_spec.tv_sec, t_tm) == NULL) { + char errbuf[1024]; + status = errno; + ERROR ("get_local_time: localtime_r failed: %s", + sstrerror (status, errbuf, sizeof (errbuf))); + return status; + } + + *nsec = t_spec.tv_nsec; + return 0; +} /* }}} int get_local_time */ + +/********************************************************************** + Formatting functions +***********************************************************************/ + +static const char zulu_zone[] = "Z"; + /* format_zone reads time zone information from "extern long timezone", exported * by , and formats it according to RFC 3339. This differs from * strftime()'s "%z" format by including a colon between hour and minute. */ @@ -112,60 +162,90 @@ static int format_zone (char *buffer, size_t buffer_size, struct tm const *tm) / return 0; } /* }}} int format_zone */ -static int format_rfc3339 (char *buffer, size_t buffer_size, cdtime_t t, _Bool print_nano) /* {{{ */ +int format_rfc3339 (char *buffer, size_t buffer_size, struct tm const *t_tm, long nsec, _Bool print_nano, char const *zone) /* {{{ */ +{ + int len; + char *pos = buffer; + size_t size_left = buffer_size; + + if ((len = strftime (pos, size_left, "%Y-%m-%dT%H:%M:%S", t_tm)) == 0) + return ENOMEM; + pos += len; + size_left -= len; + + if (print_nano) { + if ((len = ssnprintf (pos, size_left, ".%09ld", nsec)) == 0) + return ENOMEM; + pos += len; + size_left -= len; + } + + sstrncpy (buffer, zone, buffer_size); + return 0; +} /* }}} int format_rfc3339 */ + +int format_rfc3339_utc (char *buffer, size_t buffer_size, cdtime_t t, _Bool print_nano) /* {{{ */ { - struct timespec t_spec; struct tm t_tm; - char base[20]; /* 2006-01-02T15:04:05 */ - char nano[11]; /* .999999999 */ - char zone[7]; /* +00:00 */ - char *fields[] = {base, nano, zone}; - size_t len; + long nsec = 0; int status; - CDTIME_T_TO_TIMESPEC (t, &t_spec); - NORMALIZE_TIMESPEC (t_spec); + if ((status = get_utc_time (t, &t_tm, &nsec)) != 0) + return status; /* The error should have already be reported. */ - if (localtime_r (&t_spec.tv_sec, &t_tm) == NULL) { - char errbuf[1024]; - status = errno; - ERROR ("format_rfc3339: localtime_r failed: %s", - sstrerror (status, errbuf, sizeof (errbuf))); - return (status); - } + return format_rfc3339 (buffer, buffer_size, &t_tm, nsec, print_nano, zulu_zone); +} /* }}} int format_rfc3339_utc */ - len = strftime (base, sizeof (base), "%Y-%m-%dT%H:%M:%S", &t_tm); - if (len == 0) - return ENOMEM; +int format_rfc3339_local (char *buffer, size_t buffer_size, cdtime_t t, _Bool print_nano) /* {{{ */ +{ + struct tm t_tm; + long nsec = 0; + int status; + char zone[7]; /* +00:00 */ - if (print_nano) - ssnprintf (nano, sizeof (nano), ".%09ld", (long) t_spec.tv_nsec); - else - sstrncpy (nano, "", sizeof (nano)); + if ((status = get_local_time (t, &t_tm, &nsec)) != 0) + return status; /* The error should have already be reported. */ - status = format_zone (zone, sizeof (zone), &t_tm); - if (status != 0) + if ((status = format_zone (zone, sizeof (zone), &t_tm)) != 0) return status; - if (strjoin (buffer, buffer_size, fields, STATIC_ARRAY_SIZE (fields), "") < 0) - return ENOMEM; - return 0; -} /* }}} int format_rfc3339 */ + return format_rfc3339 (buffer, buffer_size, &t_tm, nsec, print_nano, zone); +} /* }}} int format_rfc3339_local */ + +/********************************************************************** + Public functions +***********************************************************************/ int rfc3339 (char *buffer, size_t buffer_size, cdtime_t t) /* {{{ */ { if (buffer_size < RFC3339_SIZE) return ENOMEM; - return format_rfc3339 (buffer, buffer_size, t, 0); -} /* }}} size_t cdtime_to_rfc3339 */ + return format_rfc3339_utc (buffer, buffer_size, t, 0); +} /* }}} int rfc3339 */ int rfc3339nano (char *buffer, size_t buffer_size, cdtime_t t) /* {{{ */ { if (buffer_size < RFC3339NANO_SIZE) return ENOMEM; - return format_rfc3339 (buffer, buffer_size, t, 1); -} /* }}} size_t cdtime_to_rfc3339nano */ + return format_rfc3339_utc (buffer, buffer_size, t, 1); +} /* }}} int rfc3339nano */ + +int rfc3339_local (char *buffer, size_t buffer_size, cdtime_t t) /* {{{ */ +{ + if (buffer_size < RFC3339_SIZE) + return ENOMEM; + + return format_rfc3339_local (buffer, buffer_size, t, 0); +} /* }}} int rfc3339 */ + +int rfc3339nano_local (char *buffer, size_t buffer_size, cdtime_t t) /* {{{ */ +{ + if (buffer_size < RFC3339NANO_SIZE) + return ENOMEM; + + return format_rfc3339_local (buffer, buffer_size, t, 1); +} /* }}} int rfc3339nano */ /* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/src/daemon/utils_time.h b/src/daemon/utils_time.h index 4d88dccb..78347239 100644 --- a/src/daemon/utils_time.h +++ b/src/daemon/utils_time.h @@ -82,15 +82,24 @@ extern cdtime_t cdtime_mock; cdtime_t cdtime (void); -#define RFC3339_SIZE 26 -#define RFC3339NANO_SIZE 36 +#define RFC3339_SIZE 26 /* 2006-01-02T15:04:05+00:00 */ +#define RFC3339NANO_SIZE 36 /* 2006-01-02T15:04:05.999999999+00:00 */ -/* rfc3339 formats a cdtime_t time in RFC 3339 format with second precision. */ +/* rfc3339 formats a cdtime_t time as UTC in RFC 3339 zulu format with second + * precision, e.g., "2006-01-02T15:04:05Z". */ int rfc3339 (char *buffer, size_t buffer_size, cdtime_t t); -/* rfc3339nano formats a cdtime_t time in RFC 3339 format with nanosecond - * precision. */ +/* rfc3339nano formats a cdtime_t as UTC time in RFC 3339 zulu format with + * nanosecond precision, e.g., "2006-01-02T15:04:05.999999999Z". */ int rfc3339nano (char *buffer, size_t buffer_size, cdtime_t t); +/* rfc3339 formats a cdtime_t time as local in RFC 3339 format with second + * precision, e.g., "2006-01-02T15:04:05+00:00". */ +int rfc3339_local (char *buffer, size_t buffer_size, cdtime_t t); + +/* rfc3339nano formats a cdtime_t time as local in RFC 3339 format with + * nanosecond precision, e.g., "2006-01-02T15:04:05.999999999+00:00". */ +int rfc3339nano_local (char *buffer, size_t buffer_size, cdtime_t t); + #endif /* UTILS_TIME_H */ /* vim: set sw=2 sts=2 et : */ diff --git a/src/postgresql.c b/src/postgresql.c index 084eae45..8b609492 100644 --- a/src/postgresql.c +++ b/src/postgresql.c @@ -833,7 +833,7 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl, assert (db->database != NULL); assert (db->writers != NULL); - if (rfc3339nano (time_str, sizeof (time_str), vl->time) != 0) { + if (rfc3339nano_local (time_str, sizeof (time_str), vl->time) != 0) { log_err ("c_psql_write: Failed to convert time to RFC 3339 format"); return -1; }