support to print timestamp in date-time format

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

script/bash-completion.sh

@@ -1,2 +1,2 @@
-complete -W '-s --saddr --saddr6 -d --daddr --daddr6 --addr --addr6 -p -D --dport -S --sport -P --port --pid -t --trace -v --detail --debug --ret --basic --diag --diag-quiet --diag-keep --drop --hooks -h --help' nettrace
+complete -W '-s --saddr --saddr6 -d --daddr --daddr6 --addr --addr6 -p -D --dport -S --sport -P --port --pid -t --trace -v --detail --debug --ret --basic --diag --diag-quiet --diag-keep --date --drop --hooks -h --help' nettrace
 complete -W '-h -s -d --addr -p --dport --sport --port -t -v --detail --stack --stack-tracer --timeline -c --ret --skb-mode --force-stack --tcp-flags -o --output' nettrace-legacy

shared/pkt_utils.c

@@ -1,22 +1,53 @@
 #include <linux/icmp.h>
+#include <time.h>
+#include <linux/unistd.h>
+#include <linux/kernel.h>
+#include <sys/sysinfo.h>
 #define _LINUX_IN_H
 #include <netinet/in.h>
 
 #include "pkt_utils.h"
 
-int ts_print_packet(char *buf, packet_t *pkt, char *minfo)
+static time_t time_offset;
+static struct tm *convert_ts_to_date(u64 ts)
+{
+	struct tm *p;
+	time_t tmp;
+
+	if (!time_offset) {
+		struct sysinfo s_info;
+		sysinfo(&s_info);
+
+		time(&time_offset);
+		time_offset -= s_info.uptime;
+	}
+
+	tmp = time_offset + (ts / 1000000000);
+	return localtime(&tmp);
+}
+
+int ts_print_packet(char *buf, packet_t *pkt, char *minfo,
+		    bool date_format)
 {
 	static char saddr[MAX_ADDR_LENGTH], daddr[MAX_ADDR_LENGTH];
+	u64 ts = pkt->ts;
+	struct tm *p;
 	u8 flags, l4;
 	int pos = 0;
-	u64 ts;
 
-	ts = pkt->ts;
-	if (ts)
+	if (date_format) {
+		p = convert_ts_to_date(ts);
+		BUF_FMT("[%d-%d-%d %02d:%02d:%02d.%06d] ", 1900 + p->tm_year,
+			1 + p->tm_mon, p->tm_mday, p->tm_hour, p->tm_min,
+			p->tm_sec, ts % 1000000000 / 1000);
+	} else {
 		BUF_FMT("[%llu.%06llu] ", ts / 1000000000,
 			ts % 1000000000 / 1000);
+	}
+
 	if (minfo)
 		BUF_FMT("%s", minfo);
+
 	if (!pkt->proto_l3) {
 		BUF_FMT("unknow");
 		goto out;
@@ -97,5 +128,5 @@ int ts_print_packet(char *buf, packet_t *pkt, char *minfo)
 
 int base_print_packet(char *buf, packet_t *pkt)
 {
-	return ts_print_packet(buf, pkt, NULL);
+	return ts_print_packet(buf, pkt, NULL, false);
 }

shared/pkt_utils.h

@@ -14,9 +14,10 @@
 		pos = sprintf(buf, fmt, ##args);	\
 	} while (0)
 
-#define BUF_FMT(fmt, args...) pos += sprintf(buf + pos, fmt, ##args);
+#define BUF_FMT(fmt, args...) pos += sprintf(buf + pos, fmt, ##args)
 
-int ts_print_packet(char *buf, packet_t *pkt, char *minfo);
+int ts_print_packet(char *buf, packet_t *pkt, char *minfo,
+		    bool date_format);
 int base_print_packet(char *buf, packet_t *pkt);
 
 #endif

src/analysis.c

@@ -164,7 +164,7 @@ static void analy_entry_handle(analy_entry_t *entry)
 		sprintf(tinfo, "[%-20s] ", t->name);
 	}
 
-	ts_print_packet(buf, pkt, tinfo);
+	ts_print_packet(buf, pkt, tinfo, trace_ctx.args.date);
 
 	if (trace_ctx.mode == TRACE_MODE_BASIC)
 		goto out;

src/nettrace.c

@@ -43,6 +43,11 @@ static void do_parse_args(int argc, char *argv[])
 			.type = OPTION_BOOL,
 			.desc = "show extern packet info, such as pid, ifname, etc",
 		},
+		{
+			.lname = "date", .dest = &trace_args->date,
+			.type = OPTION_BOOL,
+			.desc = "print timestamp in date-time format",
+		},
 		{
 			.lname = "basic", .dest = &trace_args->basic,
 			.type = OPTION_BOOL,

src/trace.h

@@ -62,6 +62,7 @@ typedef struct trace_args {
 	bool intel_keep;
 	bool basic;
 	bool drop;
+	bool date;
 	char *traces;
 } trace_args_t;