/*
* TODO
- * - make period size a tuneable
- * - check all structs initialised
- * - check all fd watches properly undone
* - check all init functions called
+ * - check ipf->inprogress managed properly
+ * - xperhaps_close
* - actually implement badusage
* - options for all options
* - manpage
/*----- general definitions, probably best not changed -----*/
-#define PERIOD_SECONDS 60
-
#define CONNCHILD_ESTATUS_STREAM 4
#define CONNCHILD_ESTATUS_NOSTREAM 5
#define LIST_REMHEAD(l) LIST_REMSOMEHOW((l),list_remhead)
#define LIST_REMTAIL(l) LIST_REMSOMEHOW((l),list_remtail)
+#define LIST_INIT(l) ((l).hd, list_new((struct list*)&(l)))
#define LIST_HEAD(l) ((typeof((l).hd))(list_head((struct list*)&(l))))
#define LIST_NEXT(n) ((typeof(n))list_succ(NODE((n))))
#define LIST_BACK(n) ((typeof(n))list_pred(NODE((n))))
static int max_connections=10, max_queue_per_conn=200;
static int target_max_feedfile_size=100000;
+static int period_seconds=60;
+
static double max_bad_data_ratio= 0.01;
static int max_bad_data_initial= 30;
/* in one corrupt 4096-byte block the number of newlines has
oop_readable_call *readable_callback;
void *readable_callback_user;
- int fd;
+ int fd; /* may be 0, meaning closed */
Filemon_Perfile *filemon;
oop_read *rd;
struct Conn {
ISNODE(Conn);
- int fd, max_queue, stream, quitting;
+ int fd; /* may be 0, meaning closed (during construction/destruction) */
+ int max_queue, stream, quitting;
int since_activity; /* periods */
ArticleList waiting; /* not yet told peer */
ArticleList priority; /* peer says send it now */
static void conn_dispose(Conn *conn) {
if (!conn) return;
+ if (conn->fd) {
+ loop->cancel_fd(loop, conn->fd, OOP_WRITE);
+ loop->cancel_fd(loop, conn->fd, OOP_EXCEPTION);
+ }
perhaps_close(&conn->fd);
free(conn);
until_connect= reconnect_delay_periods;
if (got != -1) {
assert(got==connecting_child);
connecting_child= 0;
- if (WIFEXITED(status) &&
- (WEXITSTATUS(status) != 0 &&
- WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
- WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)) {
- /* child already reported the problem */
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) != 0 &&
+ WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
+ WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)
+ /* child already reported the problem */;
+ else
+ warn("connect: connection child exited code %d but no cmsg",
+ WEXITSTATUS(status));
} else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) {
warn("connect: connection attempt timed out");
- } else if (!WIFEXITED(status)) {
+ } else {
report_child_status("connect", status);
- /* that's probably the root cause then */
}
} else {
/* child is still running apparently, report the socket problem */
syswarn("connect: read from child socket failed");
else if (e == OOP_EXCEPTION)
warn("connect: unexpected exception on child socket");
- else
+ else if (!rs)
warn("connect: unexpected EOF on child socket");
+ else
+ fatal("connect: unexpected lack of cmsg from child");
}
goto x;
}
CHK(len, CMSG_LEN(sizeof(conn->fd)));
#undef CHK
- if (CMSG_NXTHDR(&msg,h)) { die("connect: child sent many cmsgs"); goto x; }
+ if (CMSG_NXTHDR(&msg,h)) die("connect: child sent many cmsgs");
memcpy(&conn->fd, CMSG_DATA(h), sizeof(conn->fd));
+ loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
int status;
pid_t got= waitpid(connecting_child, &status, 0);
}
/* Phew! */
+ LIST_INIT(conn->waiting);
+ LIST_INIT(conn->priority);
+ LIST_INIT(conn->sent);
setnonblock(conn->fd, 1);
conn->max_queue= conn->stream ? max_queue_per_conn : 1;
- LIST_ADDHEAD(conns, conn);
notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
+ LIST_ADDHEAD(conns, conn);
+
connect_attempt_discard();
check_master_queue();
return 0;
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
else if (whichcount == RC_unwanted) update_nocheck(0);
InputFile *ipf= art->ipf;
+ assert(ipf->fd);
+
while (art->blanklen) {
static const char spaces[]=
" "
ipf->inprogress--;
assert(ipf->inprogress >= 0);
+ free(art);
if (!ipf->inprogress && ipf != main_input_file)
queue_check_input_done();
-
- free(art);
}
static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev,
assert(ipf != main_input_file); /* promised by tailing_try_read */
inputfile_tailing_stop(ipf);
- assert(ipf->fd >= 0);
+ 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= -1;
+ ipf->fd= 0;
if (ipf == flushing_input_file) {
assert(sms==sm_SEPARATED || sms==sm_DROPPING);
if (errno==ENOENT) return 0;
sysfatal("unable to open input file %s", path);
}
+ assert(fd>0);
InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1);
memset(ipf,0,sizeof(*ipf));
return ipf;
}
-static void close_input_file(InputFile *ipf) {
+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->inprogress); /* no dangling pointers pointing here */
- if (ipf->fd >= 0)
+ if (ipf->fd) {
if (close(ipf->fd)) sysdie("could not close input file %s", ipf->path);
+ ipf->fd= 0;
+ }
}
ipf->readcount_ok++;
art= xmalloc(sizeof(*art) - 1 + midlen + 1);
- art->offset= ipf->offset;
- art->blanklen= recsz;
- art->midlen= midlen;
art->state= art_Unchecked;
+ art->midlen= midlen;
art->ipf= ipf; ipf->inprogress++;
art->token= TextToToken(tokentextbuf);
+ art->offset= ipf->offset;
+ art->blanklen= recsz;
strcpy(art->messageid, space+1);
LIST_ADDTAIL(queue, art);
errno=EAGAIN;
return -1;
} else if (ipf==flushing_input_file) {
- assert(ipf->fd>=0);
+ assert(ipf->fd);
assert(sms==sm_SEPARATED || sms==sm_DROPPING);
} else if (ipf==backlog_input_file) {
- assert(ipf->fd>=0);
+ assert(ipf->fd);
} else {
abort();
}
};
static void inputfile_tailing_start(InputFile *ipf) {
- assert(!ipf->fd);
+ assert(!ipf->rd);
ipf->readable.on_readable= tailing_on_readable;
ipf->readable.on_cancel= tailing_on_cancel;
ipf->readable.try_read= tailing_try_read;
}
static void inputfile_tailing_stop(InputFile *ipf) {
- assert(ipf->fd);
+ assert(ipf->rd);
oop_rd_cancel(ipf->rd);
oop_rd_delete(ipf->rd);
ipf->rd= 0;
| V | | V
| ============= V V ============
| SEPARATED-1 | | DROPPING-1
- | flsh->fd>=0 | | flsh->fd>=0
+ | flsh->fd>0 | | flsh->fd>0
| [Separated] | | [Dropping]
| main F idle | | main none
| old D tail | | old D tail
| V | | V
| =============== | | ===============
| SEPARATED-2 | | DROPPING-2
- | flsh->fd==-1 | V flsh->fd==-1
+ | flsh->fd==0 | V flsh->fd==0
| [Finishing] | | [Dropping]
| main F tail | `. main none
| old D closed | `. old D closed
static int inputfile_is_done(InputFile *ipf) {
if (!ipf) return 0;
if (ipf->inprogress) return 0; /* new article in the meantime */
- if (ipf->fd >= 0); return 0; /* not had EOF */
+ if (ipf->fd) 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 >= 0 ? "-1" : "-2";
+ xtra= flushing_input_file->fd ? "-1" : "-2";
break;
default:;
}
now= xtime();
double age= difftime(now, oldest_mtime);
- long age_deficiency= (backlog_retry_minperiods * PERIOD_SECONDS) - age;
+ long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
if (age_deficiency <= 0) {
debug("backlog scan: found age=%f deficiency=%ld oldest=%s",
return;
}
- until_backlog_nextscan= age_deficiency / PERIOD_SECONDS;
+ until_backlog_nextscan= age_deficiency / period_seconds;
if (backlog_spontaneous_rescan_periods >= 0 &&
until_backlog_nextscan > backlog_spontaneous_rescan_periods)
static void postfork_inputfile(InputFile *ipf) {
if (!ipf) return;
- assert(ipf->fd >= 0);
- close(ipf->fd);
- ipf->fd= -1;
+ assert(ipf->fd);
+ perhaps_close(&ipf->fd);
}
static void postfork_stdio(FILE *f) {
}
#define EVERY(what, interval_sec, interval_usec, body) \
- static const struct timeval what##_timeout = \
- { interval_sec, interval_usec }; \
+ static struct timeval what##_timeout = { interval_sec, interval_usec }; \
static void what##_schedule(void); \
static void *what##_timedout(oop_source *lp, struct timeval tv, void *u) { \
{ body } \
return slash ? slash+1 : ipf->path;
}
-EVERY(period, PERIOD_SECONDS,0, {
+EVERY(period, -1,0, {
debug("PERIOD"
" sms=%s[%d] conns=%d queue=%d until_connect=%d"
" input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_IPF(flushing)
static void op_periods_rndup(const Option *o, const char *val) {
int *store= o->store;
op_seconds(o,val);
- *store += PERIOD_SECONDS-1;
- *store /= PERIOD_SECONDS;
+ *store += period_seconds-1;
+ *store /= period_seconds;
}
static void op_setint(const Option *o, const char *val) {
notice("starting");
+ LIST_INIT(conns);
+ LIST_INIT(queue);
+
if (!filemon_method_init()) {
warn("no file monitoring available, polling");
filepoll_schedule();
}
+ period_timeout.tv_sec= period_seconds;
period_schedule();
statemc_init();
~ian / inn-innduct.git / blobdiff