summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-02-02 10:02:40 +0100
committerantirez <antirez@gmail.com>2012-02-02 10:02:40 +0100
commitf373061563e75cf70acc6ead8b8c1727172f7547 (patch)
tree45d26cb8ae50de74747c51ac4e0cbb5ec888793b
parent29b3794231d5670a587fd42bec8061eb29e57023 (diff)
downloadredis-f373061563e75cf70acc6ead8b8c1727172f7547.tar.gz
Added a server.arch_bits field instead of computing it at runtime for INFO.
-rw-r--r--src/redis.c5
-rw-r--r--src/redis.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/redis.c b/src/redis.c
index 34b3d418e..4de9203d4 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -798,6 +798,7 @@ void createSharedObjects(void) {
}
void initServerConfig() {
+ server.arch_bits = (sizeof(long) == 8) ? 64 : 32;
server.port = REDIS_SERVERPORT;
server.bindaddr = NULL;
server.unixsocket = NULL;
@@ -1257,7 +1258,7 @@ sds genRedisInfoString(void) {
"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"
@@ -1300,7 +1301,7 @@ sds genRedisInfoString(void) {
,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 8a89bf00a..0d0895079 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -381,6 +381,7 @@ struct sharedObjectsStruct {
/* Global server state structure */
struct redisServer {
pthread_t mainthread;
+ int arch_bits;
int port;
char *bindaddr;
char *unixsocket;