From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 6 Nov 2015 14:50:55 +0000 (+0000)
Subject: Fix log time format utility
X-Git-Tag: 1.1.0~627
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe927a38449754f0a5fe090c52b5552b75dd04fd;p=rspamd.git

Fix log time format utility
---

diff --git a/src/libutil/util.c b/src/libutil/util.c
index d493568e0..85ece5b4a 100644
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -1161,19 +1161,16 @@ resolve_stat_filename (rspamd_mempool_t * pool,
 }
 
 const gchar *
-rspamd_log_check_time (gdouble start_real, gdouble start_virtual, gint resolution)
+rspamd_log_check_time (gdouble start, gdouble end, gint resolution)
 {
-	double vdiff, diff, end_real, end_virtual;
+	gdouble diff;
 	static gchar res[64];
-	static gchar fmt[sizeof ("%.10f ms real, %.10f ms virtual")];
+	gchar fmt[32];
 
-	end_real = rspamd_get_ticks ();
-	end_virtual = rspamd_get_virtual_ticks ();
-	vdiff = (end_virtual - start_virtual) * 1000;
-	diff = (end_real - start_real) * 1000;
+	diff = (end - start) * 1000.0;
 
-	sprintf (fmt, "%%.%dfms real, %%.%dfms virtual", resolution, resolution);
-	snprintf (res, sizeof (res), fmt, diff, vdiff);
+	rspamd_snprintf (fmt, sizeof (fmt), "%%.%df", resolution);
+	rspamd_snprintf (res, sizeof (res), fmt, diff);
 
 	return (const gchar *)res;
 }
diff --git a/src/libutil/util.h b/src/libutil/util.h
index 68ee6babc..06240e19b 100644
--- a/src/libutil/util.h
+++ b/src/libutil/util.h
@@ -158,7 +158,7 @@ gchar * resolve_stat_filename (rspamd_mempool_t *pool,
 	gchar *from);
 
 const gchar *
-rspamd_log_check_time (gdouble start_real, gdouble start_virtual, gint resolution);
+rspamd_log_check_time (gdouble start, gdouble end, gint resolution);
 
 /*
  * File locking functions