X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftime.h;h=8588cf554c487912875253cd81f1631529bda38a;hp=8a7dd958ffeeb6b86ef4a1ce1b11cf1c10a6a42b;hb=14c4262b940630bbb75f68b8c2eaef2b134a62d9;hpb=2daf65025e0fe5c15179dc4bfb26f875e3d31a26

diff --git a/src/common/time.h b/src/common/time.h
index 8a7dd958f..8588cf554 100644
--- a/src/common/time.h
+++ b/src/common/time.h
@@ -20,11 +20,35 @@
 #define LTTNG_TIME_H
 
 #include <time.h>
+#include <stdbool.h>
+#include <common/macros.h>
+#include <common/compat/time.h>
 
-#define MSEC_PER_SEC	1000ULL
-#define NSEC_PER_SEC	1000000000ULL
-#define NSEC_PER_MSEC	1000000ULL
-#define NSEC_PER_USEC	1000ULL
+#define MSEC_PER_SEC    1000ULL
+#define NSEC_PER_SEC    1000000000ULL
+#define NSEC_PER_MSEC   1000000ULL
+#define NSEC_PER_USEC   1000ULL
+#define USEC_PER_SEC    1000000ULL
+#define USEC_PER_MSEC   1000ULL
+
+#define SEC_PER_MINUTE  60ULL
+#define MINUTE_PER_HOUR 60ULL
+
+#define USEC_PER_MINUTE (USEC_PER_SEC * SEC_PER_MINUTE)
+#define USEC_PER_HOURS  (USEC_PER_MINUTE * MINUTE_PER_HOUR)
+
+#define ISO8601_STR_LEN sizeof("YYYYmmddTHHMMSS+HHMM")
+#define DATETIME_STR_LEN sizeof("YYYYmmdd-HHMMSS")
+
+LTTNG_HIDDEN
+bool locale_supports_utf8(void);
+
+#define NSEC_UNIT       "ns"
+#define USEC_UNIT       (locale_supports_utf8() ? "µs" : "us")
+#define MSEC_UNIT       "ms"
+#define SEC_UNIT        "s"
+#define MIN_UNIT        "m"
+#define HR_UNIT         "h"
 
 /*
  * timespec_to_ms: Convert timespec to milliseconds.
@@ -32,11 +56,26 @@
  * Returns 0 on success, else -1 on error. errno is set to EOVERFLOW if
  * input would overflow the output in milliseconds.
  */
+LTTNG_HIDDEN
 int timespec_to_ms(struct timespec ts, unsigned long *ms);
 
 /*
  * timespec_abs_diff: Absolute difference between timespec.
  */
+LTTNG_HIDDEN
 struct timespec timespec_abs_diff(struct timespec ts_a, struct timespec ts_b);
 
+/*
+ * Format a Unix timestamp to an ISO 8601 compatible timestamp of
+ * the form "YYYYmmddTHHMMSS+HHMM" in local time. `len` must >= to
+ * ISO8601_STR_LEN.
+ *
+ * Returns 0 on success, else -1 on error.
+ */
+LTTNG_HIDDEN
+int time_to_iso8601_str(time_t time, char *str, size_t len);
+
+LTTNG_HIDDEN
+int time_to_datetime_str(time_t time, char *str, size_t len);
+
 #endif /* LTTNG_TIME_H */