Fix calls to NanoTimer to call twice, due to defer.

Author: gconnell

blockfile/blockfile.go

@@ -85,7 +85,7 @@ func (b *BlockFile) readPacket(pos int64, ci *gopacket.CaptureInfo) ([]byte, err
 	// 28 bytes actually isn't the entire packet header, but it's all the fields
 	// that we care about.
 	packetsRead.Increment()
-	defer packetReadNanos.NanoTimer()
+	defer packetReadNanos.NanoTimer()()
 	var dataBuf [28]byte
 	_, err := b.f.ReadAt(dataBuf[:], pos)
 	if err != nil {
@@ -130,7 +130,7 @@ type allPacketsIter struct {
 }
 
 func (a *allPacketsIter) Next() bool {
-	defer packetScanNanos.NanoTimer()
+	defer packetScanNanos.NanoTimer()()
 	if a.err != nil || a.done {
 		return false
 	}

indexfile/indexfile.go

@@ -139,7 +139,7 @@ func (i *IndexFile) positions(ctx context.Context, from, to []byte) (out base.Po
 		indexCurrentReads.IncrementBy(-1)
 		indexReads.Increment()
 	}()
-	defer indexReadNanos.NanoTimer()
+	defer indexReadNanos.NanoTimer()()
 	iter := i.ss.Find(from, nil)
 	keyLen := len(from)
 	last := make([]byte, keyLen)

stats/stats_test.go

@@ -0,0 +1,31 @@
+// Copyright 2014 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package stats
+
+import (
+	"testing"
+	"time"
+)
+
+func TestNanoTimer(t *testing.T) {
+	s := &Stat{}
+	func() {
+		defer s.NanoTimer()()
+		time.Sleep(time.Millisecond)
+	}()
+	if got := s.int64; got < 1000000 {
+		t.Error("invalid nano time:", got)
+	}
+}