Fixed 32bit make target to work on Linux out of the box

diff --git a/Makefile b/Makefile
index c6a61b1e4caaaa83409fa857553ae0b7fb833dc8..9f7dde3a98d0a93fa3a85d1fa01ce04c00e51a37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,10 @@ log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:

-       make ARCH="-arch i386"
+       @echo ""
+       @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
+       @echo ""
+       make ARCH="-m32"

 
 gprof:
        make PROF="-pg"
 
 gprof:
        make PROF="-pg"

diff --git a/redis.c b/redis.c
index 972ebf06036e204b6479651ff7e01de3b14c7997..d34b2abe0f3b3ac654383745dab7638cb8a63b78 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -7406,7 +7406,7 @@ static int vmWriteObjectOnSwap(robj *o, off_t page) {
     if (fseeko(server.vm_fp,page*server.vm_page_size,SEEK_SET) == -1) {
         if (server.vm_enabled) pthread_mutex_unlock(&server.io_swapfile_mutex);
         redisLog(REDIS_WARNING,
     if (fseeko(server.vm_fp,page*server.vm_page_size,SEEK_SET) == -1) {
         if (server.vm_enabled) pthread_mutex_unlock(&server.io_swapfile_mutex);
         redisLog(REDIS_WARNING,

-            "Critical VM problem in vmSwapObjectBlocking(): can't seek: %s",
+            "Critical VM problem in vmWriteObjectOnSwap(): can't seek: %s",

             strerror(errno));
         return REDIS_ERR;
     }
             strerror(errno));
         return REDIS_ERR;
     }


@@ -7922,8 +7922,8 @@ static void *IOThreadEntryPoint(void *arg) {
         lockThreadedIO();
         if (listLength(server.io_newjobs) == 0) {
             /* No new jobs in queue, exit. */
         lockThreadedIO();
         if (listLength(server.io_newjobs) == 0) {
             /* No new jobs in queue, exit. */

-            redisLog(REDIS_DEBUG,"Thread %lld exiting, nothing to do",
-                (long long) pthread_self());
+            redisLog(REDIS_DEBUG,"Thread %ld exiting, nothing to do",
+                (long) pthread_self());

             server.io_active_threads--;
             unlockThreadedIO();
             return NULL;
             server.io_active_threads--;
             unlockThreadedIO();
             return NULL;


@@ -7936,8 +7936,8 @@ static void *IOThreadEntryPoint(void *arg) {
         listAddNodeTail(server.io_processing,j);
         ln = listLast(server.io_processing); /* We use ln later to remove it */
         unlockThreadedIO();
         listAddNodeTail(server.io_processing,j);
         ln = listLast(server.io_processing); /* We use ln later to remove it */
         unlockThreadedIO();

-        redisLog(REDIS_DEBUG,"Thread %lld got a new job (type %d): %p about key '%s'",
-            (long long) pthread_self(), j->type, (void*)j, (char*)j->key->ptr);
+        redisLog(REDIS_DEBUG,"Thread %ld got a new job (type %d): %p about key '%s'",
+            (long) pthread_self(), j->type, (void*)j, (char*)j->key->ptr);

 
         /* Process the Job */
         if (j->type == REDIS_IOJOB_LOAD) {
 
         /* Process the Job */
         if (j->type == REDIS_IOJOB_LOAD) {


@@ -7952,8 +7952,8 @@ static void *IOThreadEntryPoint(void *arg) {
         }
 
         /* Done: insert the job into the processed queue */
         }
 
         /* Done: insert the job into the processed queue */

-        redisLog(REDIS_DEBUG,"Thread %lld completed the job: %p (key %s)",
-            (long long) pthread_self(), (void*)j, (char*)j->key->ptr);
+        redisLog(REDIS_DEBUG,"Thread %ld completed the job: %p (key %s)",
+            (long) pthread_self(), (void*)j, (char*)j->key->ptr);

         lockThreadedIO();
         listDelNode(server.io_processing,ln);
         listAddNodeTail(server.io_processed,j);
         lockThreadedIO();
         listDelNode(server.io_processing,ln);
         listAddNodeTail(server.io_processed,j);

diff --git a/test-redis.tcl b/test-redis.tcl
index 36b82e38156eff1db0d64d51a1c3f508bf5ae566..9b546722481761f27238597ab92050b87af0e63d 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -952,6 +952,7 @@ proc main {server port} {
         $r sort tosort {DESC}
     } [lsort -decreasing -integer $res]
 
         $r sort tosort {DESC}
     } [lsort -decreasing -integer $res]
 

+while 1 {

     test {SORT speed, sorting 10000 elements list using BY, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {
     test {SORT speed, sorting 10000 elements list using BY, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {


@@ -962,7 +963,7 @@ proc main {server port} {
         flush stdout
         format {}
     } {}
         flush stdout
         format {}
     } {}

-
+}

     test {SORT speed, sorting 10000 elements list directly, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {
     test {SORT speed, sorting 10000 elements list directly, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {