Merge lp:~registry/mysql-proxy/millisec_timestamp into lp:mysql-proxy

[Michael Schuster]

Bug #52063 Need millisec timestamps in src/chassis_log.c

=== modified file 'src/chassis-log.c'
--- src/chassis-log.c	2010-06-04 16:44:54 +0000
+++ src/chassis-log.c	2010-06-28 13:09:28 +0000
@@ -93,6 +93,7 @@
 
 	log->log_file_fd = -1;
 	log->log_ts_str = g_string_sized_new(sizeof("2004-01-01T00:00:00.000Z"));
+	log->log_ts_resolution = CHASSIS_RESOLUTION_DEFAULT;
 	log->min_lvl = G_LOG_LEVEL_CRITICAL;
 
 	log->last_msg = g_string_new(NULL);
@@ -173,18 +174,34 @@
 
 static int chassis_log_update_timestamp(chassis_log *log) {
 	struct tm *tm;
-	time_t t;
+	struct timeval tv;
 	GString *s = log->log_ts_str;
 
-	t = time(NULL);
-	
-	tm = localtime(&(t));
+	gettimeofday(&tv, NULL);
+	tm = localtime(&(tv.tv_sec));
 	
 	s->len = strftime(s->str, s->allocated_len, "%Y-%m-%d %H:%M:%S", tm);
+	if (log->log_ts_resolution == CHASSIS_RESOLUTION_MS)
+		g_string_append_printf(s, ".%.3d", (int) tv.tv_usec/1000);
 	
 	return 0;
 }
 
+void chassis_set_logtimestamp_resolution(chassis_log *log, int res) {
+	if (log == NULL)
+		return;
+	/* only set resolution to valid values, ignore otherwise */
+	if (res == CHASSIS_RESOLUTION_SEC || res == CHASSIS_RESOLUTION_MS)
+		log->log_ts_resolution = res;
+}
+
+int chassis_get_logtimestamp_resolution(chassis_log *log) {
+	if (log == NULL)
+		return -1;
+	return log->log_ts_resolution;
+}
+
+
 static int chassis_log_write(chassis_log *log, int log_level, GString *str) {
 	if (-1 != log->log_file_fd) {
 		/* prepend a timestamp */

=== modified file 'src/chassis-log.h'
--- src/chassis-log.h	2010-06-04 16:44:54 +0000
+++ src/chassis-log.h	2010-06-28 13:09:28 +0000
@@ -29,6 +29,11 @@
 
 #include "chassis-exports.h"
 
+#define CHASSIS_RESOLUTION_SEC	0x0
+#define CHASSIS_RESOLUTION_MS	0x1
+
+#define CHASSIS_RESOLUTION_DEFAULT	CHASSIS_RESOLUTION_SEC
+
 /** @addtogroup chassis */
 /*@{*/
 typedef struct {
@@ -46,6 +51,7 @@
 	gboolean rotate_logs;
 
 	GString *log_ts_str;
+	gint	 log_ts_resolution;	/*<< timestamp resolution (sec, ms) */
 
 	GString *last_msg;
 	time_t   last_msg_ts;
@@ -62,6 +68,8 @@
 CHASSIS_API void chassis_log_set_logrotate(chassis_log *log);
 CHASSIS_API int chassis_log_set_event_log(chassis_log *log, const char *app_name);
 CHASSIS_API const char *chassis_log_skip_topsrcdir(const char *message);
+CHASSIS_API void chassis_set_logtimestamp_resolution(chassis_log *log, int res);
+CHASSIS_API int chassis_get_logtimestamp_resolution(chassis_log *log);
 /*@}*/
 
 #endif

=== modified file 'tests/unit/check_chassis_log.c'
--- tests/unit/check_chassis_log.c	2010-04-06 14:26:51 +0000
+++ tests/unit/check_chassis_log.c	2010-06-28 13:09:28 +0000
@@ -59,11 +59,46 @@
 }
 /*@}*/
 
+/**
+ * @test Test log timestamp resolution
+ */
+START_TEST(test_log_timestamp) {
+	chassis_log *l;
+	GLogFunc old_log_func;
+
+	l = chassis_log_new();
+	chassis_set_logtimestamp_resolution(l, CHASSIS_RESOLUTION_SEC);
+
+	g_log_set_always_fatal(G_LOG_FATAL_MASK);
+
+	old_log_func = g_log_set_default_handler(chassis_log_func, l);
+
+	g_critical("this message has a second-resolution timestamp");
+	chassis_set_logtimestamp_resolution(l, CHASSIS_RESOLUTION_MS);
+	g_critical("this message has a millisecond-resolution timestamp");
+
+	g_assert_cmpint(CHASSIS_RESOLUTION_MS, ==, chassis_get_logtimestamp_resolution(l));
+	/* try an illegal value, we should see no change */
+	chassis_set_logtimestamp_resolution(l, -1);
+	g_assert_cmpint(CHASSIS_RESOLUTION_MS, ==, chassis_get_logtimestamp_resolution(l));
+	/* tset back top _SEC resolution */
+	chassis_set_logtimestamp_resolution(l, CHASSIS_RESOLUTION_SEC);
+	g_assert_cmpint(CHASSIS_RESOLUTION_SEC, ==, chassis_get_logtimestamp_resolution(l));
+
+	
+
+	g_log_set_default_handler(old_log_func, NULL);
+
+	chassis_log_free(l);
+}
+/*@}*/
+
 int main(int argc, char **argv) {
 	g_test_init(&argc, &argv, NULL);
 	g_test_bug_base("http://bugs.mysql.com/");
 
 	g_test_add_func("/core/log_compress", test_log_compress);
+	g_test_add_func("/core/log_timestamp", test_log_timestamp);
 
 	return g_test_run();
 }