+/*
+ * TODO
+ * - close idle connections
+ * - -k kill mode ?
+ */
+
/*
* Newsfeeds file entries should look like this:
* host.name.of.site[/exclude,exclude,...]\
#define LIST_REMHEAD(l) LIST_REMSOMEHOW((l),list_remhead)
#define LIST_REMTAIL(l) LIST_REMSOMEHOW((l),list_remtail)
-#define LIST_HEAD(l) ((typeof((l)->hd))(list_head((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))))
/*----- function predeclarations -----*/
-static void conn_check_work(Conn *conn);
+static void conn_maybe_write(Conn *conn);
static void conn_make_some_xmits(Conn *conn);
static void *conn_write_some_xmits(Conn *conn);
static void filemon_setfile(int mainfeed_fd, const char *mainfeed_path);
static void filemon_callback(void);
-static ConnList *conn_determine_right_list(Conn *conn);
-static void conn_assign_one_article(ConnList *connlist, Conn **last_assigned);
static void statemc_setstate(StateMachineState newsms, int periods,
const char *forlog, const char *why);
static void check_master_queue(void);
+static void queue_check_input_done(void);
static void postfork(const char *what);
static void postfork_inputfile(InputFile *ipf);
+static void open_defer(void);
+
/*----- configuration options -----*/
static char *sitename, *feedfile;
#define RCI_TRIPLE_FMT_BASE "%d(id%d+bd%d+nc%d)"
#define RCI_TRIPLE_VALS_BASE(counts,x) \
- , counts[art_Unchecked] x \
+ counts[art_Unchecked] x \
+ counts[art_Wanted] x \
+ counts[art_Unsolicited] x, \
counts[art_Unchecked] x \
, counts[art_Unsolicited] x
typedef enum {
-#define RC_INDEX(x) RCI_##x,
+#define RC_INDEX(x) RC_##x,
RESULT_COUNTS(RC_INDEX, RC_INDEX)
RCI_max
} ResultCountIndex;
struct Conn {
ISNODE(Conn);
- int fd, max_queue, stream;
- ArticleList queue; /* not yet told peer, or CHECK said send it */
+ int fd, max_queue, stream, quitting;
+ ArticleList waiting; /* not yet told peer */
+ ArticleList priority; /* peer says send it now */
ArticleList sent; /* offered/transmitted - in xmit or waiting reply */
struct iovec xmit[CONNIOVS];
XmitDetails xmitd[CONNIOVS];
/*========== making new connections ==========*/
+static void conn_dispose(Conn *conn) {
+ if (!conn) return;
+ perhaps_close(&conn->fd);
+ free(conn);
+ until_connect= reconnect_delay_periods;
+}
+
static int connecting_sockets[2]= {-1,-1};
static pid_t connecting_child;
return 0;
x:
- if (conn) {
- perhaps_close(&conn->fd);
- free(conn);
- }
+ conn_dispose(conn);
connect_attempt_discard();
}
+static int allow_connect_start(void) {
+ return conns.count < max_connections
+ && !connecting_child
+ && !until_connect;
+}
+
static void connect_start(void) {
assert(!connecting_sockets[0]);
assert(!connecting_sockets[1]);
/*========== overall control of article flow ==========*/
-static int conn_owned_articles(Conn *conn) {
- return conn->sent.count + conn->queue.count;
-}
-
static void check_master_queue(void) {
- if (!queue.count)
- return;
-
- Conn *last_assigned=0;
for (;;) {
- if (working.head) {
- conn_assign_one_article(&working, &last_assigned);
- } else if (idle.head) {
- conn_assign_one_article(&idle, &last_assigned);
- } else if (full.count < max_connections &&
- !connecting_child && !until_connect) {
+ if (!queue.count)
+ break;
+
+ Conn *walk, *use=0;
+ int spare;
+
+ /* Find a connection to offer this article. We prefer a busy
+ * connection to an idle one, provided it's not full. We take the
+ * first (oldest) and since that's stable, it will mean we fill up
+ * connections in order. That way if we have too many
+ * connections, the spare ones will go away eventually.
+ */
+ for (walk=LIST_HEAD(conns); walk; walk=LIST_NEXT(walk)) {
+ int inqueue= walk->sent.count + walk->priority.count
+ + walk->waiting.count;
+ spare= walk->max_queue - inqueue;
+ assert(inqueue <= max_queue_per_conn);
+ assert(spare >= 0);
+ if (inqueue==0) /*idle*/ { if (!use) use= walk; }
+ else if (spare>0) /*working*/ { use= walk; break; }
+ }
+ if (use) {
+ while (spare>0) {
+ Article *art= LIST_REMHEAD(queue);
+ LIST_ADDTAIL(use->waiting, art);
+ spare--;
+ }
+ conn_maybe_write(use);
+ } else if (allow_connect_start()) {
until_connect= reconnect_delay_periods;
connect_start();
+ break;
} else {
break;
}
}
- conn_check_work(last_assigned);
-}
-
-static void conn_assign_one_article(ConnList *connlist, Conn **last_assigned) {
- Conn *conn= connlist->head;
-
- LIST_REMOVE(*connlist, conn);
- Article *art= LIST_REMHEAD(queue);
- LIST_ADDTAIL(conn->queue, art);
- LIST_ADDTAIL(*conn_determine_right_list(conn), conn);
-
- /* This slightly odd arrangement is so that we call conn_check_work
- * once after filling the queue for a new connection in
- * check_master_queue, rather than for each article. */
- if (conn != *last_assigned && *last_assigned)
- conn_check_work(*last_assigned);
- *last_assigned= conn;
-}
-
-static ConnList *conn_determine_right_list(Conn *conn) {
- int inqueue= conn_owned_articles(conn);
- assert(inqueue <= max_queue_per_conn);
- if (inqueue == 0) return &idle;
- if (inqueue == conn->max_queue) return &full;
- return &working;
}
static void *conn_writeable(oop_source *l, int fd, oop_event ev, void *u) {
- conn_check_work(u);
+ conn_maybe_write(u);
return OOP_CONTINUE;
}
-static void conn_check_work(Conn *conn) {
+static void conn_maybe_write(Conn *conn) {
void *rp= 0;
for (;;) {
conn_make_some_xmits(conn);
int requeue[art_MaxState];
Article *art;
- while ((art= LIST_REMHEAD(conn->queue))) LIST_ADDTAIL(queue, 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;
char *m= xvasprintf(fmt,al);
warn("#%d connection failed, requeueing " RCI_TRIPLE_FMT_BASE ": %s",
- conn->fd, RCI_TRIPLE_FMT_VALS(requeue, /*nothing*/), m);
+ conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
- close(conn->fd);
- fixme remove conn from the appropriate list;
- free(conn);
-
- until_connect= reconnect_delay_periods;
+ LIST_REMOVE(conns,conn);
+ conn_dispose(conn);
check_master_queue();
}
-static void connfail(Connection *conn, const char *fmt, ...)
+static void connfail(Conn *conn, const char *fmt, ...)
__attribute__((__format__(printf,2,3)));
-static void connfail(Connection *conn, const char *fmt, ...) {
+static void connfail(Conn *conn, const char *fmt, ...) {
va_list al;
va_start(al,fmt);
- vconnfail(fmt,al);
+ vconnfail(conn,fmt,al);
va_end(al);
}
XmitKind kind) { /* caller must then fill in details */
struct iovec *v= &conn->xmit[conn->xmitu];
XmitDetails *d= &conn->xmitd[conn->xmitu++];
- v->iov_base= data;
+ v->iov_base= (char*)data;
v->iov_len= len;
d->kind= kind;
return d;
#define XMIT_LITERAL(lit) (xmit_noalloc(conn, (lit), sizeof(lit)-1))
static void xmit_artbody(Conn *conn, ARTHANDLE *ah /* consumed */) {
- XmitDetails *d= xmit_core(conn, ah->data, ah->len, sk_Artdata);
+ XmitDetails *d= xmit_core(conn, ah->data, ah->len, xk_Artdata);
d->info.sm_art= ah;
}
}
assert(rs > 0);
- for (done=0; rs && done<xmitu; done++) {
+ int done;
+ for (done=0; rs && done<conn->xmitu; done++) {
struct iovec *vp= &conn->xmit[done];
XmitDetails *dp= &conn->xmitd[done];
if (rs > vp->iov_len) {
if (conn->xmitu+5 > CONNIOVS)
break;
- Article *art= LIST_REMHEAD(queue);
+ Article *art= LIST_REMHEAD(conn->priority);
+ if (!art) art= LIST_REMHEAD(conn->waiting);
if (!art) break;
if (art->state >= art_Wanted || (conn->stream && nocheck)) {
/* actually send it */
- ARTHANDLE *artdata= SMretrieve();
+ ARTHANDLE *artdata= SMretrieve(art->token, RETR_ALL);
if (conn->stream) {
if (artdata) {
XMIT_LITERAL("TAKETHIS ");
- xmit_noalloc(conn, art->mid, art->midlen);
+ xmit_noalloc(conn, art->messageid, art->midlen);
XMIT_LITERAL("\r\n");
xmit_artbody(conn, artdata);
}
art->state=
art->state == art_Unchecked ? art_Unsolicited :
art->state == art_Wanted ? art_Wanted :
- abort();
- art->ipf->counts[art->state].sent++;
+ (abort(),-1);
+ art->ipf->counts[art->state][RC_sent]++;
LIST_ADDTAIL(conn->sent, art);
} else {
XMIT_LITERAL("IHAVE ");
else
XMIT_LITERAL("CHECK ");
- xmit_noalloc(art->mid, art->midlen);
+ xmit_noalloc(conn, art->messageid, art->midlen);
XMIT_LITERAL("\r\n");
assert(art->state == art_Unchecked);
- art->ipf->counts[art->state].sent++;
+ art->ipf->counts[art->state][RC_sent]++;
LIST_ADDTAIL(conn->sent, art);
}
}
return OOP_CONTINUE;
}
-static Article *article_reply_check(Connection *conn, const char *response,
+static Article *article_reply_check(Conn *conn, const char *response,
int code_indicates_streaming,
int must_have_sent
/* 1:yes, -1:no, 0:dontcare */,
const char *sanitised_response) {
- Article *art= conn->sent.head;
+ Article *art= LIST_HEAD(conn->sent);
if (!art) {
connfail(conn,
if (code_indicates_streaming) {
assert(!memchr(response, 0, 4)); /* ensured by peer_rd_ok */
if (!conn->stream) {
- connfail("peer gave streaming response code "
+ connfail(conn, "peer gave streaming response code "
" to IHAVE or subsequent body: %s", sanitised_response);
return 0;
}
const char *got_mid= response+4;
int got_midlen= strcspn(got_mid, " \n\r");
if (got_midlen<3 || got_mid[0]!='<' || got_mid[got_midlen-1]!='>') {
- connfail("peer gave streaming response with syntactically invalid"
+ connfail(conn, "peer gave streaming response with syntactically invalid"
" messageid: %s", sanitised_response);
return 0;
}
if (got_midlen != art->midlen ||
memcmp(got_mid, art->messageid, got_midlen)) {
- connfail("peer gave streaming response code to wrong article -"
+ connfail(conn, "peer gave streaming response code to wrong article -"
" probable synchronisation problem; we offered: %s;"
" peer said: %s",
art->messageid, sanitised_response);
}
} else {
if (conn->stream) {
- connfail("peer gave non-streaming response code to CHECK/TAKETHIS: %s",
- sanitised_response);
+ connfail(conn, "peer gave non-streaming response code to"
+ " CHECK/TAKETHIS: %s", sanitised_response);
return 0;
}
}
if (must_have_sent>0 && art->state < art_Wanted) {
- connfail("peer says article accepted but we had not sent the body: %s",
- sanitised_response);
+ connfail(conn, "peer says article accepted but"
+ " we had not sent the body: %s", sanitised_response);
return 0;
}
if (must_have_sent<0 && art->state >= art_Wanted) {
- connfail("peer says please sent the article but we just did: %s",
+ connfail(conn, "peer says please sent the article but we just did: %s",
sanitised_response);
return 0;
}
}
static void update_nocheck(int accepted) {
- accept_proportion *= accept_decay;
- accept_proportion += accepted;
+ accept_proportion *= nocheck_decay;
+ accept_proportion += accepted * (1.0 - nocheck_decay);
int new_nocheck= accept_proportion >= nocheck_thresh;
if (new_nocheck && !nocheck_reported) {
notice("entering nocheck mode for the first time");
nocheck= new_nocheck;
}
-static void article_done(Connection *conn, Article *art, int whichcount) {
+static void article_done(Conn *conn, Article *art, int whichcount) {
art->ipf->counts[art->state][whichcount]++;
if (whichcount == RC_accepted) update_nocheck(1);
else if (whichcount == RC_unwanted) update_nocheck(0);
}
assert(ev == OOP_RD_OK);
- char *sani= sanitise(data, recsz);
+ char *sani= sanitise(data);
char *ep;
unsigned long code= strtoul(data, &ep, 10);
}
if (conn->quitting) {
- if (code!=205) {
- connfail(conn, "peer gave failure response to QUIT: %s", sani);
- return OOP_CONTINUE;
+ if (code!=205 && code!=503) {
+ connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
+ } else {
+ notice("#%d idle connection closed\n");
+ assert(!conn->waiting.count);
+ assert(!conn->priority.count);
+ assert(!conn->sent.count);
+ assert(!conn->xmitu);
+ LIST_REMOVE(conns,conn);
+ conn_dispose(conn);
}
- conn close ok;
- return;
+ return OOP_CONTINUE;
}
Article *art;
if (art) ; else return OOP_CONTINUE /* reply_check has failed the conn */
#define ARTICLE_DEALTWITH(streaming,musthavesent,how) \
- code_streaming= (streaming) \
+ code_streaming= (streaming); \
GET_ARTICLE(musthavesent); \
article_done(conn, art, RC_##how); break;
case 335: /* IHAVE says send it */
GET_ARTICLE(-1);
assert(art->state == art_Unchecked);
- art->ipf->counts[art->state].accepted++;
+ art->ipf->counts[art->state][RC_accepted]++;
art->state= art_Wanted;
- LIST_ADDTAIL(conn->queue);
+ LIST_ADDTAIL(conn->priority, art);
break;
case 431: /* CHECK or TAKETHIS says try later */
}
- check_check_work(conn);
+ conn_maybe_write(conn);
+ check_master_queue();
return OOP_CONTINUE;
}
const char *spec) {
#define RCI_NOTHING(x) /* nothing */
#define RCI_TRIPLE_FMT(x) " " #x "=" RCI_TRIPLE_FMT_BASE
-#define RCI_TRIPLE_VALS(x) RCI_TRIPLE_VALS_BASE(ipf->counts, .x)
+#define RCI_TRIPLE_VALS(x) , RCI_TRIPLE_VALS_BASE(ipf->counts, .x)
info("processed %s%s offered=%d(ch%d,nc%d) accepted=%d(ch%d+nc%d)"
RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_FMT)
ipf->fd= -1;
}
-static void postfork_conns(Connection *conn) {
- while (conn) {
- close(conn->fd);
- conn= conn->next;
- }
-}
-
static void postfork_stdio(FILE *f) {
/* we have no stdio streams that are buffered long-term */
if (f) fclose(f);
postfork_inputfile(main_input_file);
postfork_inputfile(flushing_input_file);
- postfork_conns(idle.head);
- postfork_conns(working.head);
- postfork_conns(full.head);
+
+ Conn *conn;
+ for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
+ close(conn->fd);
+
postfork_stdio(defer);
}
EVERY(period, {PERIOD_SECONDS,0}, {
debug("PERIOD"
- " sms=%s[%d] queue=%d until_connect=%d"
+ " sms=%s[%d] conns=%d queue=%d until_connect=%d"
" input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_FMT(flushing)
- " conns idle=%d working=%d full=%d"
" children connecting=%ld inndcomm_child"
,
- sms_names[sms], sm_period_counter, queue.count, until_connect,
+ sms_names[sms], sm_period_counter,
+ queue.count, conns.count, until_connect,
DEBUG_IPF(main), DEBUG_IPF(flushing), DEBUG_IPF(flushing),
- idle.count, working.count, full.count,
(long)connecting_child, (long)inndcomm_child
);
~ian / innduct.git / blobdiff