us to ignore a timeout without turning off the timeout-related
time-keeping that the keep-alive processing needs.
- Added a new function: maybe_send_keepalive().
const char phase_unknown[] = "unknown";
int select_timeout = SELECT_TIMEOUT;
const char phase_unknown[] = "unknown";
int select_timeout = SELECT_TIMEOUT;
int batch_fd = -1;
int batch_gen_fd = -1;
int batch_fd = -1;
int batch_gen_fd = -1;
+ if (!io_timeout || ignore_timeout)
+void maybe_send_keepalive(int allowed_lull, int ndx)
+{
+ if (time(NULL) - last_io >= allowed_lull) {
+ if (!iobuf_out || !iobuf_out_cnt) {
+ write_int(sock_f_out, ndx);
+ write_shortint(sock_f_out, ITEM_IS_NEW);
+ }
+ if (iobuf_out)
+ io_flush(NORMAL_FLUSH);
+ }
+}
+
+
/**
* Continue trying to read len bytes - don't return until len has been
* read.
/**
* Continue trying to read len bytes - don't return until len has been
* read.
* to grab any messages they sent before they died. */
while (fd == sock_f_out && io_multiplexing_in) {
io_timeout = select_timeout = 30;
* to grab any messages they sent before they died. */
while (fd == sock_f_out && io_multiplexing_in) {
io_timeout = select_timeout = 30;
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
sizeof io_filesfrom_buf);
}
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
sizeof io_filesfrom_buf);
}