From 75eaac5c7410553b089f11632c5755004a0a6665 Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 2 Feb 2012 10:02:40 +0100 Subject: [PATCH] Added a server.arch_bits field instead of computing it at runtime for INFO. --- src/redis.c | 5 +++-- src/redis.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/redis.c b/src/redis.c index 8cb18e91..8dd35c4e 100644 --- a/src/redis.c +++ b/src/redis.c @@ -860,6 +860,7 @@ void createSharedObjects(void) { } void initServerConfig() { + server.arch_bits = (sizeof(long) == 8) ? 64 : 32; 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" - "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" @@ -1450,7 +1451,7 @@ sds genRedisInfoString(char *section) { REDIS_VERSION, redisGitSHA1(), strtol(redisGitDirty(),NULL,10) > 0, - (sizeof(long) == 8) ? "64" : "32", + server.arch_bits, aeGetApiName(), #ifdef __GNUC__ __GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__, diff --git a/src/redis.h b/src/redis.h index 2fcdcb4d..66a51c83 100644 --- 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 arch_bits; /* 32 or 64 depending on sizeof(long) */ /* Networking */ int port; /* TCP listening port */ char *bindaddr; /* Bind address or NULL */ -- 2.45.2