Fixed issue #516 (ZINTERSTORE mixing sets and zsets).

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index 8ac842479d9c835291f9ec48026a84cb701ed5c6..e279aab48c5b7dccb10bf46e2091a394663a4e0a 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -38,12 +38,13 @@
 #define REDIS_ERR               -1
 
 /* Static server configuration */
+#define REDIS_HZ                100     /* Time interrupt calls/sec. */
 #define REDIS_SERVERPORT        6379    /* TCP port */
 #define REDIS_MAXIDLETIME       0       /* default client timeout: infinite */
 #define REDIS_DEFAULT_DBNUM     16
 #define REDIS_CONFIGLINE_MAX    1024
 #define REDIS_EXPIRELOOKUPS_PER_CRON    10 /* lookup 10 expires per loop */
-#define REDIS_EXPIRELOOKUPS_TIME_LIMIT 25  /* Time limit in milliseconds */
+#define REDIS_EXPIRELOOKUPS_TIME_PERC   25 /* CPU max % for keys collection */
 #define REDIS_MAX_WRITE_PER_EVENT (1024*64)
 #define REDIS_SHARED_SELECT_CMDS 10
 #define REDIS_SHARED_INTEGERS 10000