From 6199e901ea51b226b59889548a941e4402c6b3a7 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 22 Oct 2009 10:30:53 +0100
Subject: When using devkit-power --monitor, print a timestamp before each
 message for debugging. Fixes fd#24666

---
 tools/dkp-tool.c | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/dkp-tool.c b/tools/dkp-tool.c
index 7d79311..f853706 100644
--- a/tools/dkp-tool.c
+++ b/tools/dkp-tool.c
@@ -40,17 +40,42 @@
 static GMainLoop *loop;
 static gboolean opt_monitor_detail = FALSE;
 
+/**
+ * dkp_tool_get_timestamp:
+ **/
+static gchar *
+dkp_tool_get_timestamp (void)
+{
+	gchar *str_time;
+	gchar *timestamp;
+	time_t the_time;
+	struct timeval time_val;
+
+	time (&the_time);
+	gettimeofday (&time_val, NULL);
+	str_time = g_new0 (gchar, 255);
+	strftime (str_time, 254, "%H:%M:%S", localtime (&the_time));
+
+	/* generate header text */
+	timestamp = g_strdup_printf ("%s.%03i", str_time, (gint) time_val.tv_usec / 1000);
+	g_free (str_time);
+	return timestamp;
+}
+
 /**
  * dkp_tool_device_added_cb:
  **/
 static void
 dkp_tool_device_added_cb (DkpClient *client, const DkpDevice *device, gpointer user_data)
 {
-	g_print ("device added:     %s\n", dkp_device_get_object_path (device));
+	gchar *timestamp;
+	timestamp = dkp_tool_get_timestamp ();
+	g_print ("[%s]\tdevice added:     %s\n", timestamp, dkp_device_get_object_path (device));
 	if (opt_monitor_detail) {
 		dkp_device_print (device);
 		g_print ("\n");
 	}
+	g_free (timestamp);
 }
 
 /**
@@ -59,12 +84,15 @@ dkp_tool_device_added_cb (DkpClient *client, const DkpDevice *device, gpointer u
 static void
 dkp_tool_device_changed_cb (DkpClient *client, const DkpDevice *device, gpointer user_data)
 {
-	g_print ("device changed:     %s\n", dkp_device_get_object_path (device));
+	gchar *timestamp;
+	timestamp = dkp_tool_get_timestamp ();
+	g_print ("[%s]\tdevice changed:     %s\n", timestamp, dkp_device_get_object_path (device));
 	if (opt_monitor_detail) {
 		/* TODO: would be nice to just show the diff */
 		dkp_device_print (device);
 		g_print ("\n");
 	}
+	g_free (timestamp);
 }
 
 /**
@@ -73,9 +101,12 @@ dkp_tool_device_changed_cb (DkpClient *client, const DkpDevice *device, gpointer
 static void
 dkp_tool_device_removed_cb (DkpClient *client, const DkpDevice *device, gpointer user_data)
 {
-	g_print ("device removed:   %s\n", dkp_device_get_object_path (device));
+	gchar *timestamp;
+	timestamp = dkp_tool_get_timestamp ();
+	g_print ("[%s]\tdevice removed:   %s\n", timestamp, dkp_device_get_object_path (device));
 	if (opt_monitor_detail)
 		g_print ("\n");
+	g_free (timestamp);
 }
 
 /**
@@ -119,11 +150,14 @@ dkp_client_print (DkpClient *client)
 static void
 dkp_tool_changed_cb (DkpClient *client, gpointer user_data)
 {
-	g_print ("daemon changed:\n");
+	gchar *timestamp;
+	timestamp = dkp_tool_get_timestamp ();
+	g_print ("[%s]\tdaemon changed:\n", timestamp);
 	if (opt_monitor_detail) {
 		dkp_client_print (client);
 		g_print ("\n");
 	}
+	g_free (timestamp);
 }
 
 /**
-- 
cgit v1.2.1