Fix for slaves chains. Force resync of slaves (simply disconnecting them) when SLAVE...

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index 4b5c94dc3ead37d36ab44b1399b139983f681abb..e36e13f10b9a72d884047b071d77f0fca0fe3116 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -590,6 +590,7 @@ struct redisServer {
     char *assert_file;
     int assert_line;
     int bug_report_start; /* True if bug report header was already logged. */
     char *assert_file;
     int assert_line;
     int bug_report_start; /* True if bug report header was already logged. */

+    int watchdog_period;  /* Software watchdog period in ms. 0 = off */

 };
 
 typedef struct pubsubPattern {
 };
 
 typedef struct pubsubPattern {


@@ -683,7 +684,7 @@ extern dictType setDictType;
 extern dictType zsetDictType;
 extern dictType dbDictType;
 extern double R_Zero, R_PosInf, R_NegInf, R_Nan;
 extern dictType zsetDictType;
 extern dictType dbDictType;
 extern double R_Zero, R_PosInf, R_NegInf, R_Nan;

-dictType hashDictType;
+extern dictType hashDictType;

 
 /*-----------------------------------------------------------------------------
  * Functions prototypes
 
 /*-----------------------------------------------------------------------------
  * Functions prototypes


@@ -734,6 +735,7 @@ void asyncCloseClientOnOutputBufferLimitReached(redisClient *c);
 int getClientLimitClassByName(char *name);
 char *getClientLimitClassName(int class);
 void flushSlavesOutputBuffers(void);
 int getClientLimitClassByName(char *name);
 char *getClientLimitClassName(int class);
 void flushSlavesOutputBuffers(void);

+void disconnectSlaves(void);

 
 #ifdef __GNUC__
 void addReplyErrorFormat(redisClient *c, const char *fmt, ...)
 
 #ifdef __GNUC__
 void addReplyErrorFormat(redisClient *c, const char *fmt, ...)


@@ -869,6 +871,7 @@ void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc, in
 int prepareForShutdown();
 void redisLog(int level, const char *fmt, ...);
 void redisLogRaw(int level, const char *msg);
 int prepareForShutdown();
 void redisLog(int level, const char *fmt, ...);
 void redisLogRaw(int level, const char *msg);

+void redisLogFromHandler(int level, const char *msg);

 void usage();
 void updateDictResizePolicy(void);
 int htNeedsResize(dict *dict);
 void usage();
 void updateDictResizePolicy(void);
 int htNeedsResize(dict *dict);


@@ -1109,4 +1112,7 @@ void bugReportStart(void);
 void redisLogObjectDebugInfo(robj *o);
 void sigsegvHandler(int sig, siginfo_t *info, void *secret);
 sds genRedisInfoString(char *section);
 void redisLogObjectDebugInfo(robj *o);
 void sigsegvHandler(int sig, siginfo_t *info, void *secret);
 sds genRedisInfoString(char *section);

+void enableWatchdog(int period);
+void disableWatchdog(void);
+void watchdogScheduleSignal(int period);

 #endif
 #endif