/*
* TODO
- * - xperhaps_close
* - actually implement badusage
* - options for all options
* - manpage
static void statemc_start_flush(const char *why); /* Normal => Flushing */
static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */
-static void check_master_queue(void);
+static void check_assign_articles(void);
static void queue_check_input_done(void);
static void statemc_check_flushing_done(void);
static void close_defer(void);
static void search_backlog_file(void);
-static void inputfile_tailing_start(InputFile *ipf);
-static void inputfile_tailing_stop(InputFile *ipf);
+static void inputfile_reading_start(InputFile *ipf);
+static void inputfile_reading_stop(InputFile *ipf);
static void filemon_start(InputFile *ipf);
static void filemon_stop(InputFile *ipf);
oop_readable_call *readable_callback;
void *readable_callback_user;
- int fd; /* may be 0, meaning closed */
+ int fd;
Filemon_Perfile *filemon;
- oop_read *rd;
+ oop_read *rd; /* non-0: reading; 0: constructing, or had EOF */
long inprogress; /* no. of articles read but not processed */
off_t offset;
int skippinglong;
return str;
}
-static void perhaps_close(int *fd) { if (*fd) { close(*fd); fd=0; } }
+static int close_perhaps(int *fd) {
+ if (!*fd) return 0;
+ int r= close(*fd);
+ *fd=0;
+ return r;
+}
+static void xclose(int fd, const char *what, const char *what2) {
+ int r= close(fd);
+ if (r) sysdie("close %s%s",what,what2?what2:"");
+}
+static void xclose_perhaps(int *fd, const char *what, const char *what2) {
+ if (!*fd) return;
+ xclose(*fd,what,what2);
+ *fd=0;
+}
static pid_t xfork(const char *what) {
pid_t child;
return errnoval==EWOULDBLOCK || errnoval==EAGAIN;
}
-/*========== making new connections ==========*/
+/*========== management of connections ==========*/
static void conn_dispose(Conn *conn) {
if (!conn) return;
loop->cancel_fd(loop, conn->fd, OOP_WRITE);
loop->cancel_fd(loop, conn->fd, OOP_EXCEPTION);
}
- perhaps_close(&conn->fd);
+ int r= close_perhaps(&conn->fd);
+ if (r) info("C%d error closing socket: %s", conn->fd, strerror(errno));
free(conn);
until_connect= reconnect_delay_periods;
}
+static void *conn_exception(oop_source *lp, int fd,
+ oop_event ev, void *conn_v) {
+ Conn *conn= conn_v;
+ unsigned char ch;
+ assert(fd == conn->fd);
+ assert(ev == OOP_EXCEPTION);
+ int r= read(conn->fd, &ch, 1);
+ if (r<0) connfail(conn,"read failed: %s",strerror(errno));
+ else connfail(conn,"exceptional condition on socket (peer sent urgent"
+ " data? read(,&ch,1)=%d,ch='\\x%02x')",r,ch);
+ return OOP_CONTINUE;
+}
+
+static void vconnfail(Conn *conn, const char *fmt, va_list al) {
+ int requeue[art_MaxState];
+
+ Article *art;
+ while ((art= LIST_REMHEAD(conn->priority))) LIST_ADDTAIL(queue, art);
+ while ((art= LIST_REMHEAD(conn->waiting))) LIST_ADDTAIL(queue, art);
+ while ((art= LIST_REMHEAD(conn->sent))) {
+ requeue[art->state]++;
+ if (art->state==art_Unsolicited) art->state= art_Unchecked;
+ LIST_ADDTAIL(queue,art);
+ }
+
+ int i;
+ XmitDetails *d;
+ for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
+ xmit_free(d);
+
+ char *m= xvasprintf(fmt,al);
+ warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s",
+ conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
+ free(m);
+
+ LIST_REMOVE(conns,conn);
+ conn_dispose(conn);
+ check_assign_articles();
+}
+
+static void connfail(Conn *conn, const char *fmt, ...) {
+ va_list al;
+ va_start(al,fmt);
+ vconnfail(conn,fmt,al);
+ va_end(al);
+}
+
+static void check_idle_conns(void) {
+ Conn *conn;
+ for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
+ conn->since_activity++;
+ search_again:
+ for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn)) {
+ if (conn->since_activity <= need_activity_periods) continue;
+
+ /* We need to shut this down */
+ if (conn->quitting)
+ connfail(conn,"timed out waiting for response to QUIT");
+ else if (conn->sent.count)
+ connfail(conn,"timed out waiting for responses");
+ else if (conn->waiting.count || conn->priority.count)
+ connfail(conn,"BUG IN INNDUCT conn has queue but nothing sent");
+ else if (conn->xmitu)
+ connfail(conn,"peer has been sending responses"
+ " before receiving our commands!");
+ else {
+ static const char quitcmd[]= "QUIT\r\n";
+ int todo= sizeof(quitcmd)-1;
+ const char *p= quitcmd;
+ for (;;) {
+ int r= write(conn->fd, p, todo);
+ if (r<0) {
+ if (isewouldblock(errno))
+ connfail(conn, "blocked writing QUIT to idle connection");
+ else
+ connfail(conn, "failed to write QUIT to idle connection: %s",
+ strerror(errno));
+ break;
+ }
+ assert(r<=todo);
+ todo -= r;
+ if (!todo) {
+ conn->quitting= 1;
+ conn->since_activity= 0;
+ debug("C%d is idle, quitting", conn->fd);
+ break;
+ }
+ }
+ }
+ goto search_again;
+ }
+}
+
+/*---------- making new connections ----------*/
+
static int connecting_sockets[2]= {-1,-1};
static pid_t connecting_child;
if (connecting_sockets[0])
cancel_fd_read_except(connecting_sockets[0]);
- perhaps_close(&connecting_sockets[0]);
- perhaps_close(&connecting_sockets[1]);
+ xclose_perhaps(&connecting_sockets[0], "connecting socketpair (read)",0);
+ xclose_perhaps(&connecting_sockets[1], "connecting socketpair (write)",0);
if (connecting_child) {
int r= kill(connecting_child, SIGTERM);
LIST_ADDHEAD(conns, conn);
connect_attempt_discard();
- check_master_queue();
+ check_assign_articles();
return 0;
x:
connect_attempt_discard();
}
-static void conn_exception(oop_source *lp, int fd,
- oop_event ev, void *conn_v) {
- Conn *conn= conn_v;
- char ch;
- assert(fd == conn->fd);
- assert(ev == OOP_EXCEPTION);
- r= read(conn->fd, &ch, 1);
- if (r<0) connfail(conn,"read failed: %s",strerror(errno));
- connfail(conn,"exceptional condition on socket (peer sent urgent"
- " data? read(,,1)=%d)",r);
-}
-
static int allow_connect_start(void) {
return conns.count < max_connections
&& !connecting_child
connect_attempt_discard();
}
-static void check_idle_conns(void) {
- Conn *conn;
- for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
- conn->since_activity++;
- search_again:
- for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn)) {
- if (conn->since_activity <= need_activity_periods) continue;
+/*---------- assigning articles to conns, and transmitting ----------*/
- /* We need to shut this down */
- if (conn->quitting)
- connfail(conn,"timed out waiting for response to QUIT");
- else if (conn->sent.count)
- connfail(conn,"timed out waiting for responses");
- else if (conn->waiting.count || conn->priority.count)
- connfail(conn,"BUG IN INNDUCT conn has queue but nothing sent");
- else if (conn->xmitu)
- connfail(conn,"peer has been sending responses"
- " before receiving our commands!");
- else {
- static const char quitcmd[]= "QUIT\r\n";
- int todo= sizeof(quitcmd)-1;
- const char *p= quitcmd;
- for (;;) {
- int r= write(conn->fd, p, todo);
- if (r<0) {
- if (isewouldblock(errno))
- connfail(conn, "blocked writing QUIT to idle connection");
- else
- connfail(conn, "failed to write QUIT to idle connection: %s",
- strerror(errno));
- break;
- }
- assert(r<=todo);
- todo -= r;
- if (!todo) {
- conn->quitting= 1;
- conn->since_activity= 0;
- debug("C%d is idle, quitting", conn->fd);
- break;
- }
- }
- }
- goto search_again;
- }
-}
-
-/*========== overall control of article flow ==========*/
-
-static void check_master_queue(void) {
+static void check_assign_articles(void) {
for (;;) {
if (!queue.count)
break;
}
}
-static void vconnfail(Conn *conn, const char *fmt, va_list al) {
- int requeue[art_MaxState];
-
- Article *art;
- while ((art= LIST_REMHEAD(conn->priority))) LIST_ADDTAIL(queue, art);
- while ((art= LIST_REMHEAD(conn->waiting))) LIST_ADDTAIL(queue, art);
- while ((art= LIST_REMHEAD(conn->sent))) {
- requeue[art->state]++;
- if (art->state==art_Unsolicited) art->state= art_Unchecked;
- LIST_ADDTAIL(queue,art);
- }
-
- int i;
- XmitDetails *d;
- for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
- xmit_free(d);
-
- char *m= xvasprintf(fmt,al);
- warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s",
- conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
- free(m);
-
- LIST_REMOVE(conns,conn);
- conn_dispose(conn);
- check_master_queue();
-}
-
-static void connfail(Conn *conn, const char *fmt, ...) {
- va_list al;
- va_start(al,fmt);
- vconnfail(conn,fmt,al);
- va_end(al);
-}
-
/*========== article transmission ==========*/
static XmitDetails *xmit_core(Conn *conn, const char *data, int len,
else if (whichcount == RC_unwanted) update_nocheck(0);
InputFile *ipf= art->ipf;
- assert(ipf->fd);
while (art->blanklen) {
static const char spaces[]=
}
conn_maybe_write(conn);
- check_master_queue();
+ check_assign_articles();
return OOP_CONTINUE;
}
static void feedfile_eof(InputFile *ipf) {
assert(ipf != main_input_file); /* promised by tailing_try_read */
-
- inputfile_tailing_stop(ipf);
- assert(ipf->fd > 0);
-fixme do not close fd do something else because art_done needs it to blank entries;
- if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path);
- ipf->fd= 0;
+ inputfile_reading_stop(ipf);
if (ipf == flushing_input_file) {
assert(sms==sm_SEPARATED || sms==sm_DROPPING);
- if (main_input_file) inputfile_tailing_start(main_input_file);
+ if (main_input_file) inputfile_reading_start(main_input_file);
statemc_check_flushing_done();
} else if (ipf == backlog_input_file) {
statemc_check_backlog_done();
static void close_input_file(InputFile *ipf) { /* does not free */
assert(!ipf->readable_callback); /* must have had ->on_cancel */
- assert(!ipf->filemon); /* must have had inputfile_tailing_stop */
- assert(!ipf->rd); /* must have had inputfile_tailing_stop */
+ assert(!ipf->filemon); /* must have had inputfile_reading_stop */
+ assert(!ipf->rd); /* must have had inputfile_reading_stop */
assert(!ipf->inprogress); /* no dangling pointers pointing here */
-
- if (ipf->fd) {
- if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path);
- ipf->fd= 0;
- }
+ xclose_perhaps(&ipf->fd, "input file ", ipf->path);
}
ipf->offset >= target_max_feedfile_size)
statemc_start_flush("feed file size");
- check_master_queue();
+ check_assign_articles();
return OOP_CONTINUE;
}
errno=EAGAIN;
return -1;
} else if (ipf==flushing_input_file) {
- assert(ipf->fd);
+ assert(ipf->rd);
assert(sms==sm_SEPARATED || sms==sm_DROPPING);
} else if (ipf==backlog_input_file) {
- assert(ipf->fd);
+ assert(ipf->rd);
} else {
abort();
}
OOP_RD_SHORTREC_LONG,
};
-static void inputfile_tailing_start(InputFile *ipf) {
+static void inputfile_reading_start(InputFile *ipf) {
assert(!ipf->rd);
ipf->readable.on_readable= tailing_on_readable;
ipf->readable.on_cancel= tailing_on_cancel;
ipf->readable_callback_user= 0;
ipf->rd= oop_rd_new(loop, &ipf->readable, 0,0);
- assert(ipf->fd);
+ assert(ipf->rd);
int r= oop_rd_read(ipf->rd, &feedfile_rdstyle, MAX_LINE_FEEDFILE,
feedfile_got_article,ipf, feedfile_read_err, ipf);
if (r) sysdie("unable start reading feedfile %s",ipf->path);
}
-static void inputfile_tailing_stop(InputFile *ipf) {
+static void inputfile_reading_stop(InputFile *ipf) {
assert(ipf->rd);
oop_rd_cancel(ipf->rd);
oop_rd_delete(ipf->rd);
static void startup_set_input_file(InputFile *f) {
assert(!main_input_file);
main_input_file= f;
- inputfile_tailing_start(f);
+ inputfile_reading_start(f);
}
static void statemc_init(void) {
static int inputfile_is_done(InputFile *ipf) {
if (!ipf) return 0;
if (ipf->inprogress) return 0; /* new article in the meantime */
- if (ipf->fd) return 0; /* not had EOF */
+ if (ipf->rd) return 0; /* not had EOF */
return 1;
}
if (!main_input_file) xtra= "-ABSENT";
break;
case sm_SEPARATED: case sm_DROPPING:
- xtra= flushing_input_file->fd ? "-1" : "-2";
+ xtra= flushing_input_file->rd ? "-1" : "-2";
break;
default:;
}
warn("backlog file %s vanished as we opened it", backlog_input_file);
goto try_again;
}
- inputfile_tailing_start(backlog_input_file);
+ inputfile_reading_start(backlog_input_file);
until_backlog_nextscan= -1;
return;
}
static void postfork_inputfile(InputFile *ipf) {
if (!ipf) return;
- assert(ipf->fd);
- perhaps_close(&ipf->fd);
+ xclose(ipf->fd, "(in child) input file ", ipf->path);
}
-static void postfork_stdio(FILE *f) {
+static void postfork_stdio(FILE *f, const char *what, const char *what2) {
/* we have no stdio streams that are buffered long-term */
- if (f) fclose(f);
+ if (!f) return;
+ if (fclose(f)) sysdie("close (in child) %s%s", what, what2?what2:0);
}
static void postfork(const char *what) {
Conn *conn;
for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
- close(conn->fd);
+ close_perhaps(&conn->fd);
- postfork_stdio(defer);
+ postfork_stdio(defer, "defer file ", path_defer);
}
#define EVERY(what, interval_sec, interval_usec, body) \
poll_backlog_file();
if (!backlog_input_file) close_defer(); /* want to start on a new backlog */
statemc_period_poll();
- check_master_queue();
+ check_assign_articles();
check_idle_conns();
});
~ian / inn-innduct.git / blobdiff