summaryrefslogtreecommitdiffstats
path: root/fbench
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-05-09 09:12:18 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-05-09 09:12:18 +0200
commite6bbaaa02004e41c0504e0cdaab8fd3863e74847 (patch)
treed8ab6fda0b2ec456801519ddc6294d0e9dc293af /fbench
parent54e4075b5d67786422c99f3e306ebc4fd36faec3 (diff)
make _restarts count upwards
Diffstat (limited to 'fbench')
-rw-r--r--fbench/src/fbench/client.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp
index 21b91cb0d00..3ea3e5719b9 100644
--- a/fbench/src/fbench/client.cpp
+++ b/fbench/src/fbench/client.cpp
@@ -46,7 +46,7 @@ class UrlReader {
int _leftOversLen;
public:
UrlReader(FileReader& reader, const ClientArguments &args)
- : _reader(reader), _args(args), _restarts(args._restartLimit),
+ : _reader(reader), _args(args), _restarts(0),
_leftOvers(NULL), _leftOversLen(0)
{}
int nextUrl(char *buf, int bufLen);
@@ -70,10 +70,10 @@ int UrlReader::nextUrl(char *buf, int buflen)
// Read maximum to _queryfileOffsetEnd
if ( _args._singleQueryFile && _reader.GetFilePos() >= _args._queryfileEndOffset ) {
_reader.SetFilePos(_args._queryfileOffset);
- if (_restarts == 0) {
+ if (_restarts == _args._restartLimit) {
return 0;
- } else if (_restarts > 0) {
- _restarts--;
+ } else if (_args._restartLimit > 0) {
+ _restarts++;
}
}
int ll = _reader.ReadLine(buf, buflen);
@@ -83,10 +83,10 @@ int UrlReader::nextUrl(char *buf, int buflen)
if (ll > 0 && (buf[0] == '/' || !_args._usePostMode)) {
return ll;
}
- if (_restarts == 0) {
+ if (_restarts == _args._restartLimit) {
return 0;
- } else if (_restarts > 0) {
- _restarts--;
+ } else if (_args._restartLimit > 0) {
+ _restarts++;
}
if (ll < 0) {
_reader.Reset();