/*
- * todo
- * - rename sm_period_counter as it's just about flushes
- * - manpage: document control master stuff
- *
* debugging rune:
* build-lfs/backends/innduct --connection-timeout=30 --no-daemon -C ../inn.conf -f `pwd`/fee sit localhost
*/
+/*--
+flow control notes
+to ensure articles go away eventually
+separate queue for each input file
+ queue expiry
+ every period, check head of backlog queue for expiry with SMretrieve
+ if too old: discard, and check next article
+ also check every backlog article as we read it
+ flush expiry
+ after too long in SEPARATED/DROPPING ie Separated/Finishing/Dropping
+ one-off: eat queued articles from flushing and write them to defer
+ one-off: connfail all connections which have any articles from flushing
+ newly read articles from flushing go straight to defer
+ this should take care of it and get us out of this state
+to avoid filling up ram needlessly
+ input control
+ limit number of queued articles for each ipf
+ pause/resume inputfile tailing
+--*/
+
/*
* Newsfeeds file entries should look like this:
* host.name.of.site[/exclude,exclude,...]\
Filemon_Perfile *filemon;
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;
+ ArticleList queue;
+ long inprogress; /* includes queue.count and also articles in conns */
+
int counts[art_MaxState][RCI_max];
int readcount_ok, readcount_blank, readcount_err;
char path[];
/* main initialises */
static oop_source *loop;
static ConnList conns;
-static ArticleList queue;
static char *path_lock, *path_flushing, *path_defer;
static char *path_control, *path_dump;
static char *globpat_backlog;
/* statemc_init initialises */
static StateMachineState sms;
-static int sm_period_counter;
+static int until_flush;
static InputFile *main_input_file, *flushing_input_file, *backlog_input_file;
static FILE *defer;
const ControlCommand *ccmd;
for (ccmd=control_commands; ccmd->cmd; ccmd++)
fprintf(cc->out, " %s\n", ccmd->cmd);
+ fputs("NB: permissible arguments are not shown above."
+ " Not all commands listed are safe. See innduct(8).\n", cc->out);
}
CCMD(flush) {
{ "p", ccmd_period },
#define POKES(cmd,func) \
- { cmd "sm", func, &sm_period_counter, 1 }, \
+ { cmd "flush", func, &until_flush, 1 }, \
{ cmd "conn", func, &until_connect, 0 }, \
{ cmd "blscan", func, &until_backlog_nextscan, 0 },
-POKES("prod ", ccmd_setint_period)
POKES("next ", ccmd_setint)
+POKES("prod ", ccmd_setint_period)
{ "pretend flush", ccmd_setintarg, &simulate_flush },
{ "wedge blscan", ccmd_setint, &until_backlog_nextscan, -1 },
memset(requeue,0,sizeof(requeue));
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->priority)))
+ LIST_ADDTAIL(art->ipf->queue, art);
+
+ while ((art= LIST_REMHEAD(conn->waiting)))
+ LIST_ADDTAIL(art->ipf->queue, art);
+
while ((art= LIST_REMHEAD(conn->sent))) {
requeue[art->state]++;
if (art->state==art_Unsolicited) art->state= art_Unchecked;
- LIST_ADDTAIL(queue,art);
+ LIST_ADDTAIL(art->ipf->queue,art);
}
int i;
/*---------- assigning articles to conns, and transmitting ----------*/
+static Article *dequeue_from(int peek, InputFile *ipf) {
+ if (!ipf) return 0;
+ if (peek) return LIST_HEAD(ipf->queue);
+ else return LIST_REMHEAD(ipf->queue);
+}
+
+static Article *dequeue(int peek) {
+ Article *art;
+ art= dequeue_from(peek, flushing_input_file); if (art) return art;
+ art= dequeue_from(peek, backlog_input_file); if (art) return art;
+ art= dequeue_from(peek, main_input_file); if (art) return art;
+ return 0;
+}
+
static void check_assign_articles(void) {
for (;;) {
- if (!queue.count)
+ if (!dequeue(1))
break;
Conn *walk, *use=0;
if (use) {
if (!inqueue) use->since_activity= 0; /* reset idle counter */
while (spare>0) {
- Article *art= LIST_REMHEAD(queue);
+ Article *art= dequeue(0);
if (!art) break;
LIST_ADDTAIL(use->waiting, art);
spare--;
ipf->fd= fd;
strcpy(ipf->path, path);
+ LIST_INIT(ipf->queue);
return ipf;
}
art->offset= old_offset;
art->blanklen= recsz;
strcpy(art->messageid, space+1);
- LIST_ADDTAIL(queue, art);
+ LIST_ADDTAIL(ipf->queue, art);
if (sms==sm_NORMAL && ipf==main_input_file &&
ipf->offset >= target_max_feedfile_size)
why,
(unsigned long)(main_input_file ? main_input_file->offset : 0),
(unsigned long)target_max_feedfile_size,
- sm_period_counter);
+ until_flush);
int r= link(feedfile, path_flushing);
if (r) sysfatal("link feedfile %s to flushing file %s",
}
static void statemc_period_poll(void) {
- if (!sm_period_counter) return;
- sm_period_counter--;
- assert(sm_period_counter>=0);
+ if (!until_flush) return;
+ until_flush--;
+ assert(until_flush>=0);
- if (sm_period_counter) return;
+ if (until_flush) return;
int ok= trigger_flush_ok();
assert(ok);
}
static void statemc_setstate(StateMachineState newsms, int periods,
const char *forlog, const char *why) {
sms= newsms;
- sm_period_counter= periods;
+ until_flush= periods;
const char *xtra= "";
switch (sms) {
const char *slash= strrchr(ipf->path,'/');
const char *path= slash ? slash+1 : ipf->path;
- return xasprintf("%p/%s:ip=%ld,off=%ld,fd=%d%s%s",
+ return xasprintf("%p/%s:queue=%d,ip=%ld,off=%ld,fd=%d%s%s",
ipf, path,
- ipf->inprogress, (long)ipf->offset,
+ ipf->queue.count, ipf->inprogress, (long)ipf->offset,
ipf->fd,
ipf->rd ? "" : ",!rd",
ipf->skippinglong ? "*skiplong" : "");
char *dipf_backlog= debug_report_ipf(backlog_input_file);
debug("PERIOD"
- " sms=%s[%d] conns=%d queue=%d until_connect=%d"
+ " sms=%s[%d] conns=%d until_connect=%d"
" input_files main:%s flushing:%s backlog:%s"
" children connecting=%ld inndcomm=%ld"
,
- sms_names[sms], sm_period_counter,
- conns.count, queue.count, until_connect,
+ sms_names[sms], until_flush, conns.count, until_connect,
dipf_main, dipf_flushing, dipf_backlog,
(long)connecting_child, (long)inndcomm_child
);
}
}
-static void dump_input_file(FILE *f, InputFile *ipf, const char *wh) {
+static void dump_input_file(FILE *f, const ControlCommand *c,
+ InputFile *ipf, const char *wh) {
char *dipf= debug_report_ipf(ipf);
fprintf(f,"input %s %s", wh, dipf);
free(dipf);
wh, *statename
RESULT_COUNTS(RC_DUMP_VAL,RC_DUMP_VAL));
}
+ fprintf(f,"input %s queue", wh);
+ dump_article_list(f,c,&ipf->queue);
}
}
fprintf(f,"general");
DUMPV("%s", sms_names,[sms]);
- DUMPV("%d", ,sm_period_counter);
+ DUMPV("%d", ,until_flush);
DUMPV("%ld", (long),self_pid);
DUMPV("%p", , defer);
DUMPV("%d", , until_connect);
fprintf(f,"filemon ");
filemon_method_dump_info(f);
- dump_input_file(f, main_input_file, "main" );
- dump_input_file(f, flushing_input_file, "flushing");
- dump_input_file(f, backlog_input_file, "backlog" );
+ dump_input_file(f,c, main_input_file, "main" );
+ dump_input_file(f,c, flushing_input_file, "flushing");
+ dump_input_file(f,c, backlog_input_file, "backlog" );
fprintf(f,"conns count=%d\n", conns.count);
const struct iovec *iv= &conn->xmit[i];
const XmitDetails *xd= &conn->xmitd[i];
char *dinfo;
- long diff;
switch (xd->kind) {
case xk_Const: dinfo= xasprintf("Const"); break;
case xk_Artdata: dinfo= xasprintf("A%p", xd->info.sm_art); break;
}
}
- fprintf(f,"queue"); dump_article_list(f,c,&queue);
-
fprintf(f,"paths");
DUMPV("%s", , path_lock);
DUMPV("%s", , path_flushing);
loop= (oop_source*)sysloop;
LIST_INIT(conns);
- LIST_INIT(queue);
if (become_daemon) {
int i;
~ian / inn-innduct.git / blobdiff