Added a server.arch_bits field instead of computing it at runtime for INFO.

diff --git a/src/redis.c b/src/redis.c
index 8cb18e91d8370aa6d166f1cc7601285d19c58acd..8dd35c4ee85981e6118a9081a910fdcd787be191 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -860,6 +860,7 @@ void createSharedObjects(void) {
 }
 
 void initServerConfig() {
 }
 
 void initServerConfig() {

+    server.arch_bits = (sizeof(long) == 8) ? 64 : 32;

     server.port = REDIS_SERVERPORT;
     server.bindaddr = NULL;
     server.unixsocket = NULL;
     server.port = REDIS_SERVERPORT;
     server.bindaddr = NULL;
     server.unixsocket = NULL;


@@ -1439,7 +1440,7 @@ sds genRedisInfoString(char *section) {
             "redis_version:%s\r\n"
             "redis_git_sha1:%s\r\n"
             "redis_git_dirty:%d\r\n"
             "redis_version:%s\r\n"
             "redis_git_sha1:%s\r\n"
             "redis_git_dirty:%d\r\n"

-            "arch_bits:%s\r\n"
+            "arch_bits:%d\r\n"

             "multiplexing_api:%s\r\n"
             "gcc_version:%d.%d.%d\r\n"
             "process_id:%ld\r\n"
             "multiplexing_api:%s\r\n"
             "gcc_version:%d.%d.%d\r\n"
             "process_id:%ld\r\n"


@@ -1450,7 +1451,7 @@ sds genRedisInfoString(char *section) {
             REDIS_VERSION,
             redisGitSHA1(),
             strtol(redisGitDirty(),NULL,10) > 0,
             REDIS_VERSION,
             redisGitSHA1(),
             strtol(redisGitDirty(),NULL,10) > 0,

-            (sizeof(long) == 8) ? "64" : "32",
+            server.arch_bits,

             aeGetApiName(),
 #ifdef __GNUC__
             __GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__,
             aeGetApiName(),
 #ifdef __GNUC__
             __GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__,

diff --git a/src/redis.h b/src/redis.h
index 2fcdcb4d98d476333a87678a519f4b80470ff687..66a51c835f80ef0b82a98e5ec4e66f55036ec928 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -527,6 +527,7 @@ struct redisServer {
     int activerehashing;        /* Incremental rehash in serverCron() */
     char *requirepass;          /* Pass for AUTH command, or NULL */
     char *pidfile;              /* PID file path */
     int activerehashing;        /* Incremental rehash in serverCron() */
     char *requirepass;          /* Pass for AUTH command, or NULL */
     char *pidfile;              /* PID file path */

+    int arch_bits;              /* 32 or 64 depending on sizeof(long) */

     /* Networking */
     int port;                   /* TCP listening port */
     char *bindaddr;             /* Bind address or NULL */
     /* Networking */
     int port;                   /* TCP listening port */
     char *bindaddr;             /* Bind address or NULL */