chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: add check that makes sure time_t and TIME_T_MAX work the way we assume they do
[elogind.git]
/
src
/
basic
/
time-util.h
diff --git
a/src/basic/time-util.h
b/src/basic/time-util.h
index 9cd6949b2c345693b02a6a438c294ca776d51ec1..61f263baeaaeb666c1002e702766df7517335177 100644
(file)
--- a/
src/basic/time-util.h
+++ b/
src/basic/time-util.h
@@
-21,8
+21,12
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdio.h>
#include <inttypes.h>
#include <inttypes.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
typedef uint64_t usec_t;
typedef uint64_t nsec_t;
typedef uint64_t usec_t;
typedef uint64_t nsec_t;
@@
-65,16
+69,21
@@
typedef struct dual_timestamp {
#define FORMAT_TIMESTAMP_RELATIVE_MAX 256
#define FORMAT_TIMESPAN_MAX 64
#define FORMAT_TIMESTAMP_RELATIVE_MAX 256
#define FORMAT_TIMESPAN_MAX 64
-#define TIME_T_MAX (time_t)((
1UL
<< ((sizeof(time_t) << 3) - 1)) - 1)
+#define TIME_T_MAX (time_t)((
UINTMAX_C(1)
<< ((sizeof(time_t) << 3) - 1)) - 1)
#define DUAL_TIMESTAMP_NULL ((struct dual_timestamp) { 0ULL, 0ULL })
usec_t now(clockid_t clock);
#define DUAL_TIMESTAMP_NULL ((struct dual_timestamp) { 0ULL, 0ULL })
usec_t now(clockid_t clock);
+#if 0 /// UNNEEDED by elogind
+nsec_t now_nsec(clockid_t clock);
+#endif // 0
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
-// UNNEEDED dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
+#if 0 /// UNNEEDED by elogind
+dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, usec_t u);
dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, usec_t u);
+#endif // 0
static inline bool dual_timestamp_is_set(dual_timestamp *ts) {
return ((ts->realtime > 0 && ts->realtime != USEC_INFINITY) ||
static inline bool dual_timestamp_is_set(dual_timestamp *ts) {
return ((ts->realtime > 0 && ts->realtime != USEC_INFINITY) ||
@@
-90,27
+99,47
@@
struct timeval *timeval_store(struct timeval *tv, usec_t u);
nsec_t timespec_load_nsec(const struct timespec *ts) _pure_;
char *format_timestamp(char *buf, size_t l, usec_t t);
nsec_t timespec_load_nsec(const struct timespec *ts) _pure_;
char *format_timestamp(char *buf, size_t l, usec_t t);
-// UNNEEDED char *format_timestamp_utc(char *buf, size_t l, usec_t t);
+#if 0 /// UNNEEDED by elogind
+char *format_timestamp_utc(char *buf, size_t l, usec_t t);
+#endif // 0
char *format_timestamp_us(char *buf, size_t l, usec_t t);
char *format_timestamp_us(char *buf, size_t l, usec_t t);
-// UNNEEDED char *format_timestamp_us_utc(char *buf, size_t l, usec_t t);
+#if 0 /// UNNEEDED by elogind
+char *format_timestamp_us_utc(char *buf, size_t l, usec_t t);
+#endif // 0
char *format_timestamp_relative(char *buf, size_t l, usec_t t);
char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy);
char *format_timestamp_relative(char *buf, size_t l, usec_t t);
char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy);
-// UNNEEDED void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
-// UNNEEDED int dual_timestamp_deserialize(const char *value, dual_timestamp *t);
+#if 0 /// UNNEEDED by elogind
+void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
+int dual_timestamp_deserialize(const char *value, dual_timestamp *t);
-// UNNEEDED int parse_timestamp(const char *t, usec_t *usec);
+int parse_timestamp(const char *t, usec_t *usec);
+#endif // 0
int parse_sec(const char *t, usec_t *usec);
int parse_sec(const char *t, usec_t *usec);
+int parse_time(const char *t, usec_t *usec, usec_t default_unit);
+#if 0 /// UNNEEDED by elogind
int parse_nsec(const char *t, nsec_t *nsec);
int parse_nsec(const char *t, nsec_t *nsec);
-
// UNNEEDED
bool ntp_synced(void);
+bool ntp_synced(void);
-
// UNNEEDED
int get_timezones(char ***l);
-
// UNNEEDED
bool timezone_is_valid(const char *name);
+int get_timezones(char ***l);
+bool timezone_is_valid(const char *name);
clockid_t clock_boottime_or_monotonic(void);
clockid_t clock_boottime_or_monotonic(void);
+#endif // 0
-#define xstrftime(buf, fmt, tm) assert_se(strftime(buf, ELEMENTSOF(buf), fmt, tm) > 0)
+#define xstrftime(buf, fmt, tm) \
+ assert_message_se(strftime(buf, ELEMENTSOF(buf), fmt, tm) > 0, \
+ "xstrftime: " #buf "[] must be big enough")
+#if 0 /// UNNEEDED by elogind
int get_timezone(char **timezone);
int get_timezone(char **timezone);
+
+time_t mktime_or_timegm(struct tm *tm, bool utc);
+#endif // 0
+struct tm *localtime_or_gmtime_r(const time_t *t, struct tm *tm, bool utc);
+
+#if 0 /// UNNEEDED by elogind
+unsigned long usec_to_jiffies(usec_t usec);
+#endif // 0