a few more stuff in INFO about VM. Test #11 changed a bit in order to be less lame

diff --git a/Makefile b/Makefile
index 5caf21b8ec6394442b2546b9f2e9776e545babb8..f3aff26263e5a23cae649146b9e526e985f6bc74 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,12 @@
 # This file is released under the BSD license, see the COPYING file
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 # This file is released under the BSD license, see the COPYING file
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')

+OPTIMIZATION?=-O2

 ifeq ($(uname_S),SunOS)
 ifeq ($(uname_S),SunOS)

-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -D__EXTENSIONS__ -D_XPG6
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6

   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
 else
   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
 else

-  CFLAGS?= -std=c99 -pedantic -O2 -Wall -W $(ARCH) $(PROF)
+  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)

   CCLINK?= -lm -pthread
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
   CCLINK?= -lm -pthread
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)


@@ -83,5 +84,8 @@ gprof:
 gcov:
        make PROF="-fprofile-arcs -ftest-coverage"
 
 gcov:
        make PROF="-fprofile-arcs -ftest-coverage"
 

+noopt:
+       make OPTIMIZATION=""
+

 32bitgprof:
        make PROF="-pg" ARCH="-arch i386"
 32bitgprof:
        make PROF="-pg" ARCH="-arch i386"

diff --git a/redis.c b/redis.c
index 21b69eaca4980782deba79c8d54488604faf7d0f..9e688d8f40548b4b0cffce877e0c62a8507dbec6 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2795,6 +2795,8 @@ static int rdbSaveLzfStringObject(FILE *fp, robj *obj) {
     outlen = sdslen(obj->ptr)-4;
     if (outlen <= 0) return 0;
     if ((out = zmalloc(outlen+1)) == NULL) return 0;
     outlen = sdslen(obj->ptr)-4;
     if (outlen <= 0) return 0;
     if ((out = zmalloc(outlen+1)) == NULL) return 0;

+    printf("Calling LZF with ptr: %p\n", (void*)obj->ptr);
+    fflush(stdout);

     comprlen = lzf_compress(obj->ptr, sdslen(obj->ptr), out, outlen);
     if (comprlen == 0) {
         zfree(out);
     comprlen = lzf_compress(obj->ptr, sdslen(obj->ptr), out, outlen);
     if (comprlen == 0) {
         zfree(out);


@@ -5615,6 +5617,7 @@ static sds genRedisInfoString(void) {
             "vm_stats_io_processing_len:%lu\r\n"
             "vm_stats_io_processed_len:%lu\r\n"
             "vm_stats_io_waiting_clients:%lu\r\n"
             "vm_stats_io_processing_len:%lu\r\n"
             "vm_stats_io_processed_len:%lu\r\n"
             "vm_stats_io_waiting_clients:%lu\r\n"

+            "vm_stats_io_active_threads:%lu\r\n"

             ,(unsigned long long) server.vm_max_memory,
             (unsigned long long) server.vm_page_size,
             (unsigned long long) server.vm_pages,
             ,(unsigned long long) server.vm_max_memory,
             (unsigned long long) server.vm_page_size,
             (unsigned long long) server.vm_pages,


@@ -5625,7 +5628,8 @@ static sds genRedisInfoString(void) {
             (unsigned long) listLength(server.io_newjobs),
             (unsigned long) listLength(server.io_processing),
             (unsigned long) listLength(server.io_processed),
             (unsigned long) listLength(server.io_newjobs),
             (unsigned long) listLength(server.io_processing),
             (unsigned long) listLength(server.io_processed),

-            (unsigned long) listLength(server.io_clients)
+            (unsigned long) listLength(server.io_clients),
+            (unsigned long) server.io_active_threads

         );
     }
     for (j = 0; j < server.dbnum; j++) {
         );
     }
     for (j = 0; j < server.dbnum; j++) {

diff --git a/test-redis.tcl b/test-redis.tcl
index 1ac877e11559bcfcd4769ae69683ffb13f423c58..dacd6e5f725f298692f48c812672aa8c31d3ed5d 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -281,14 +281,19 @@ proc main {server port} {
     } [string repeat "abcd" 1000000]
 
     test {SET 10000 numeric keys and access all them in reverse order} {
     } [string repeat "abcd" 1000000]
 
     test {SET 10000 numeric keys and access all them in reverse order} {

+        set err {}

         for {set x 0} {$x < 10000} {incr x} {
             $r set $x $x
         }
         set sum 0
         for {set x 9999} {$x >= 0} {incr x -1} {
         for {set x 0} {$x < 10000} {incr x} {
             $r set $x $x
         }
         set sum 0
         for {set x 9999} {$x >= 0} {incr x -1} {

-            incr sum [$r get $x]
+            set val [$r get $x]
+            if {$val ne $x} {
+                set err "Eleemnt at position $x is $val instead of $x"
+                break
+            }

         }
         }

-        format $sum
+        set _ $err

     } {49995000}
 
     test {DBSIZE should be 10001 now} {
     } {49995000}
 
     test {DBSIZE should be 10001 now} {