From 5fba9f717be77af5bd5a5149595a1b934d4d5057 Mon Sep 17 00:00:00 2001 From: Bob Potter Date: Tue, 7 Apr 2009 18:33:44 -0500 Subject: [PATCH] 64bit fixes for usedmemory --- redis.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redis.c b/redis.c index d3e439c1..438f5fda 100644 --- a/redis.c +++ b/redis.c @@ -205,7 +205,7 @@ struct redisServer { int cronloops; /* number of times the cron function run */ list *objfreelist; /* A list of freed objects to avoid malloc() */ time_t lastsave; /* Unix time of last save succeeede */ - int usedmemory; /* Used memory in megabytes */ + size_t usedmemory; /* Used memory in megabytes */ /* Fields used only for stats */ time_t stat_starttime; /* server start time */ long long stat_numcommands; /* number of processed commands */ @@ -664,7 +664,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { /* Show information about connected clients */ if (!(loops % 5)) { - redisLog(REDIS_DEBUG,"%d clients connected (%d slaves), %d bytes in use", + redisLog(REDIS_DEBUG,"%d clients connected (%d slaves), %zu bytes in use", listLength(server.clients)-listLength(server.slaves), listLength(server.slaves), server.usedmemory, @@ -3202,7 +3202,7 @@ static void infoCommand(redisClient *c) { "redis_version:%s\r\n" "connected_clients:%d\r\n" "connected_slaves:%d\r\n" - "used_memory:%d\r\n" + "used_memory:%zu\r\n" "changes_since_last_save:%lld\r\n" "last_save_time:%d\r\n" "total_connections_received:%lld\r\n"