From 305df63054852e760cce16d7ede38a01ef88be3f Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Mon, 25 Nov 2019 13:40:27 +0300
Subject: [PATCH] - querylog: remove time counter (fix zero div exception)
---
querylog/querylog_file.go | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/querylog/querylog_file.go b/querylog/querylog_file.go
index 14299dfb..abfa6fdb 100644
--- a/querylog/querylog_file.go
+++ b/querylog/querylog_file.go
@@ -172,7 +172,7 @@ type Reader struct {
fpos uint64 // current file offset
nSeekRequests uint32 // number of Seek() requests made (finding a new line doesn't count)
- timecnt uint64
+ // timecnt uint64
}
type fileSeeker struct {
@@ -205,8 +205,15 @@ func (r *Reader) Close() {
if r.count > 0 {
perunit = elapsed / time.Duration(r.count)
}
- log.Debug("querylog: read %d entries in %v, %v/entry, seek-reqs:%d time:%dus (%d%%)",
- r.count, elapsed, perunit, r.nSeekRequests, r.timecnt/1000, r.timecnt*100/uint64(elapsed.Nanoseconds()))
+ log.Debug("querylog: read %d entries in %v, %v/entry, seek-reqs:%d",
+ r.count, elapsed, perunit, r.nSeekRequests)
+
+ // timePercent := uint64(0)
+ // if elapsed.Nanoseconds() != 0 {
+ // timePercent = r.timecnt * 100 / uint64(elapsed.Nanoseconds())
+ // }
+ // log.Debug("querylog: read %d entries in %v, %v/entry, seek-reqs:%d time:%dus (%d%%)",
+ // r.count, elapsed, perunit, r.nSeekRequests, r.timecnt/1000, timePercent)
if r.f != nil {
r.f.Close()
@@ -717,10 +724,10 @@ func (r *Reader) Next() *logEntry { // nolint
continue
}
- st := time.Now()
+ // st := time.Now()
var ent logEntry
decode(&ent, str)
- r.timecnt += uint64(time.Now().Sub(st).Nanoseconds())
+ // r.timecnt += uint64(time.Now().Sub(st).Nanoseconds())
return &ent
}