When closing the MDB DBI, do it in a transaction.

[redis.git] / src / redis-benchmark.c

diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index 1be4c07d913dcee9937b90c2f1457e6d32d8f966..ceab707238556050c2edc112719c21911bd08f1c 100644 (file)
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -1,6 +1,6 @@
 /* Redis benchmark utility.
  *
 /* Redis benchmark utility.
  *

- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -106,7 +106,7 @@ static long long mstime(void) {
     long long mst;
 
     gettimeofday(&tv, NULL);
     long long mst;
 
     gettimeofday(&tv, NULL);

-    mst = ((long)tv.tv_sec)*1000;
+    mst = ((long long)tv.tv_sec)*1000;

     mst += tv.tv_usec/1000;
     return mst;
 }
     mst += tv.tv_usec/1000;
     return mst;
 }


@@ -201,7 +201,10 @@ static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
                 if (config.requests_finished < config.requests)
                     config.latency[config.requests_finished++] = c->latency;
                 c->pending--;
                 if (config.requests_finished < config.requests)
                     config.latency[config.requests_finished++] = c->latency;
                 c->pending--;

-                if (c->pending == 0) clientDone(c);
+                if (c->pending == 0) {
+                    clientDone(c);
+                    break;
+                }

             } else {
                 break;
             }
             } else {
                 break;
             }