Merge pull request globalsign#17 from joomcode/trace-iter-next

Ability to trace getMore in iterator

Author: funny-falcon-at-joomcode

session.go

@@ -4378,7 +4378,20 @@ func (iter *Iter) Next(result interface{}) bool {
 	return iter.NextWithTimeout(result, iter.timeout)
 }
 
+func (iter *Iter) NextWithTrace(result interface{}, trace func(string, int, func())) bool {
+	return iter.NextWithTimeoutAndTrace(result, iter.timeout, trace)
+}
+
 func (iter *Iter) NextWithTimeout(result interface{}, timeout time.Duration) bool {
+	return iter.NextWithTimeoutAndTrace(result, timeout, nil)
+}
+
+func (iter *Iter) NextWithTimeoutAndTrace(result interface{}, timeout time.Duration, trace func(string, int, func())) bool {
+	getMore := iter.getMore
+	if trace != nil {
+		getMore = func() { trace(iter.op.collection, int(iter.op.limit), iter.getMore) }
+	}
+
 	iter.m.Lock()
 	iter.timedout = false
 	deadline := time.Time{}
@@ -4398,7 +4411,7 @@ func (iter *Iter) NextWithTimeout(result interface{}, timeout time.Duration) boo
 		// If we have yet to receive data, increment the timer until we timeout.
 		if iter.docsToReceive == 0 {
 			// run a getmore to fetch more data.
-			iter.getMore()
+			getMore()
 			if iter.err != nil {
 				break
 			}
@@ -4449,7 +4462,7 @@ func (iter *Iter) NextWithTimeout(result interface{}, timeout time.Duration) boo
 			// we still have a live cursor and currently expect data.
 			iter.docsBeforeMore--
 			if iter.docsBeforeMore == -1 {
-				iter.getMore()
+				getMore()
 			}
 		}
 		iter.m.Unlock()