added process id information in INFO

diff --git a/TODO b/TODO
index 705ac567daf8306d99af2c955111ca78a1f4f47f..70e12672c34c94066d4d2dd6efc58272fcddec5b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -17,6 +17,7 @@ Virtual Memory sub-TODO:
 * Divide swappability of objects by refcount
 * While loading DB from snapshot or AOF, swap objects as needed if maxmemory
   is reached, calling swapOneObject().
 * Divide swappability of objects by refcount
 * While loading DB from snapshot or AOF, swap objects as needed if maxmemory
   is reached, calling swapOneObject().

+* vm-swap-file <filename>. The swap file should go where the user wants, and if it's already there and of the right size we can avoid to create it again.

 
 VERSION 1.6 TODO (Virtual memory)
 =================================
 
 VERSION 1.6 TODO (Virtual memory)
 =================================

diff --git a/redis.c b/redis.c
index d80a5d631cbf5ec4d5650cc0c1d6ea131b044c0a..bcf61b4ad2f8ecf2d59658628b3a1611bd0e2747 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -5411,6 +5411,7 @@ static sds genRedisInfoString(void) {
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
         "multiplexing_api:%s\r\n"
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
         "multiplexing_api:%s\r\n"

+        "process_id:%ld\r\n"

         "uptime_in_seconds:%ld\r\n"
         "uptime_in_days:%ld\r\n"
         "connected_clients:%d\r\n"
         "uptime_in_seconds:%ld\r\n"
         "uptime_in_days:%ld\r\n"
         "connected_clients:%d\r\n"


@@ -5428,6 +5429,7 @@ static sds genRedisInfoString(void) {
         ,REDIS_VERSION,
         (sizeof(long) == 8) ? "64" : "32",
         aeGetApiName(),
         ,REDIS_VERSION,
         (sizeof(long) == 8) ? "64" : "32",
         aeGetApiName(),

+        (long) getpid(),

         uptime,
         uptime/(3600*24),
         listLength(server.clients)-listLength(server.slaves),
         uptime,
         uptime/(3600*24),
         listLength(server.clients)-listLength(server.slaves),