Merge branch 'watchdog' into unstable

This commit is contained in:
antirez
2012-03-28 13:16:19 +02:00
7 changed files with 126 additions and 9 deletions

View File

@ -722,6 +722,7 @@ struct redisServer {
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 {
@ -1255,4 +1256,7 @@ void bugReportStart(void);
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