#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
#define NORET __attribute__((__noreturn__))
-#define NEW(ptr) ((ptr)= zxmalloc(sizeof(*(ptr))))
-#define NEW_DECL(type,ptr) type ptr = zxmalloc(sizeof(*(ptr)))
+#define NEW(ptr) ((ptr)= zmmalloc(sizeof(*(ptr))))
+#define NEW_DECL(type,ptr) type ptr = zmmalloc(sizeof(*(ptr)))
#define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
static const char *sitename, *remote_host;
static const char *feedfile, *path_run, *path_cli, *path_cli_dir;
static int quiet_multiple=0;
-static int become_daemon=1, try_filemon=1;
+static int interactive=0, try_filemon=1;
static int try_stream=1;
static int port=119;
static const char *inndconffile;
static int max_connections=10;
static int max_queue_per_conn=200;
static int target_max_feedfile_size=100000;
-static int period_seconds=60;
+static int period_seconds=30;
static int filepoll_seconds=5;
static int max_queue_per_ipf=-1;
/* all these are initialised to seconds, and converted to periods in main */
static int reconnect_delay_periods=1000;
static int flushfail_retry_periods=1000;
-static int backlog_retry_minperiods=50;
+static int backlog_retry_minperiods=100;
static int backlog_spontrescan_periods=300;
static int spontaneous_flush_periods=100000;
static int max_separated_periods=2000;
static int need_activity_periods=1000;
+static int lowvol_thresh=3;
+static int lowvol_periods=1000;
static double max_bad_data_ratio= 1; /* conv'd from percentage by main */
static int max_bad_data_initial= 30;
ISNODE(Conn);
int fd; /* may be 0, meaning closed (during construction/destruction) */
oop_read *rd; /* likewise */
- int max_queue, stream, quitting;
+ int oopwriting; /* since on_fd is not idempotent */
+ int max_queue, stream;
+ const char *quitting;
int since_activity; /* periods */
ArticleList waiting; /* not yet told peer */
ArticleList priority; /* peer says send it now */
static char *path_lock, *path_flushing, *path_defer, *path_dump;
static char *globpat_backlog;
static pid_t self_pid;
+static int *lowvol_perperiod;
+static int lowvol_circptr;
+static int lowvol_total; /* does not include current period */
/* statemc_init initialises */
static StateMachineState sms;
static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
static void logcore(int sysloglevel, const char *fmt, ...) {
VA;
- if (become_daemon) {
+ if (interactive < 2) {
vsyslog(sysloglevel,fmt,al);
} else {
if (self_pid) fprintf(stderr,"[%lu] ",(unsigned long)self_pid);
const char *fmt, va_list al) PRINTF(5,0);
static void logv(int sysloglevel, const char *pfx, int errnoval,
const char *fmt, va_list al) {
- char msgbuf[1024]; /* NB do not call xvasprintf here or you'll recurse */
+ char msgbuf[1024]; /* NB do not call mvasprintf here or you'll recurse */
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
/*========== utility functions etc. ==========*/
-static char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
-static char *xvasprintf(const char *fmt, va_list al) {
+/* error trapping wrappers are called mfoo rather than the more
+ * conventional xfoo because we don't want to clash with the existing
+ * xfoo functions in INN libs which use different error handlers
+ */
+
+static char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0);
+static char *mvasprintf(const char *fmt, va_list al) {
char *str;
int rc= vasprintf(&str,fmt,al);
if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
return str;
}
-static char *xasprintf(const char *fmt, ...) PRINTF(1,2);
-static char *xasprintf(const char *fmt, ...) {
+static char *masprintf(const char *fmt, ...) PRINTF(1,2);
+static char *masprintf(const char *fmt, ...) {
VA;
- char *str= xvasprintf(fmt,al);
+ char *str= mvasprintf(fmt,al);
va_end(al);
return str;
}
*fd=0;
return r;
}
-static void xclose(int fd, const char *what, const char *what2) {
+static void mclose(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) {
+static void mclose_perhaps(int *fd, const char *what, const char *what2) {
if (*fd <= 0) return;
- xclose(*fd,what,what2);
+ mclose(*fd,what,what2);
*fd=0;
}
-static pid_t xfork(const char *what) {
+static pid_t mfork(const char *what) {
pid_t child;
child= fork();
}
}
-static int xwaitpid(pid_t *pid, const char *what) {
+static int mwaitpid(pid_t *pid, const char *what) {
int status;
int r= kill(*pid, SIGKILL);
return status;
}
-static void *zxmalloc(size_t sz) {
- void *p= xmalloc(sz);
+static void *mmalloc(size_t sz) {
+ void *p= malloc(sz);
+ if (!p) sysdie("unable to malloc %lu bytes",(unsigned long)sz);
+ return p;
+}
+
+static void *zmmalloc(size_t sz) {
+ void *p= mmalloc(sz);
memset(p,0,sz);
return p;
}
-static void xunlink(const char *path, const char *what) {
+static void munlink(const char *path, const char *what) {
int r= unlink(path);
if (r) sysdie("can't unlink %s %s", path, what);
}
-static time_t xtime(void) {
+static time_t mtime(void) {
time_t now= time(0);
if (now==-1) sysdie("time(2) failed");
return now;
}
-static void xsigaction(int signo, const struct sigaction *sa) {
+static void msigaction(int signo, const struct sigaction *sa) {
int r= sigaction(signo,sa,0);
if (r) sysdie("sigaction failed for \"%s\"", strsignal(signo));
}
-static void xsigsetdefault(int signo) {
+static void msigsetdefault(int signo) {
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= SIG_DFL;
- xsigaction(signo,&sa);
+ msigaction(signo,&sa);
}
-static void xgettimeofday(struct timeval *tv_r) {
+static void mgettimeofday(struct timeval *tv_r) {
int r= gettimeofday(tv_r,0);
if (r) sysdie("gettimeofday(2) failed");
}
-static void xsetnonblock(int fd, int nonblocking) {
+static void msetnonblock(int fd, int nonblocking) {
int errnoval= oop_fd_nonblock(fd, nonblocking);
if (errnoval) { errno= errnoval; sysdie("setnonblocking"); }
}
what, path, (unsigned long)stab->st_mode);
}
-static void xfstat(int fd, struct stat *stab_r, const char *what) {
+static void mfstat(int fd, struct stat *stab_r, const char *what) {
int r= fstat(fd, stab_r);
if (r) sysdie("could not fstat %s", what);
}
-static void xfstat_isreg(int fd, struct stat *stab_r,
+static void mfstat_isreg(int fd, struct stat *stab_r,
const char *path, const char *what) {
- xfstat(fd, stab_r, what);
+ mfstat(fd, stab_r, what);
check_isreg(stab_r, path, what);
}
-static void xlstat_isreg(const char *path, struct stat *stab,
+static void mlstat_isreg(const char *path, struct stat *stab,
int *enoent_r /* 0 means ENOENT is fatal */,
const char *what) {
int r= lstat(path, stab);
r= listen(cli_master, 5);
if (r) NOCLI("listen to cli master socket");
- xsetnonblock(cli_master, 1);
+ msetnonblock(cli_master, 1);
loop->on_fd(loop, cli_master, OOP_READ, cli_master_readable, 0);
info("cli ready, listening on %s", path_cli);
return;
nocli:
- xclose_perhaps(&cli_master, "cli master",0);
+ mclose_perhaps(&cli_master, "cli master",0);
return;
}
/*========== management of connections ==========*/
+static void reconnect_blocking_event(void) {
+ until_connect= reconnect_delay_periods;
+}
+
static void conn_closefd(Conn *conn, const char *msgprefix) {
int r= close_perhaps(&conn->fd);
if (r) info("C%d %serror closing socket: %s",
conn->fd, msgprefix, strerror(errno));
}
+static int conn_busy(Conn *conn) {
+ return
+ conn->waiting.count ||
+ conn->priority.count ||
+ conn->sent.count ||
+ conn->xmitu;
+}
+
static void conn_dispose(Conn *conn) {
if (!conn) return;
if (conn->rd) {
}
conn_closefd(conn,"");
free(conn);
- until_connect= reconnect_delay_periods;
}
static void *conn_exception(oop_source *lp, int fd,
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);
+ LIST_REMOVE(conns,conn);
+
+ char *m= mvasprintf(fmt,al);
+ warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+ conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
- LIST_REMOVE(conns,conn);
+ reconnect_blocking_event();
conn_dispose(conn);
check_assign_articles();
}
va_end(al);
}
+static void conn_idle_close(Conn *conn, const char *why) {
+ 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= why;
+ conn->since_activity= 0;
+ debug("C%d is idle (%s), quitting", conn->fd, why);
+ break;
+ }
+ }
+}
+
+/*
+ * For our last connection, we also shut it down if we have had
+ * less than K in the last L
+ */
static void check_idle_conns(void) {
Conn *conn;
+
+ int volthisperiod= lowvol_perperiod[lowvol_circptr];
+ lowvol_circptr++;
+ lowvol_circptr %= lowvol_periods;
+ lowvol_total += volthisperiod;
+ lowvol_total -= lowvol_perperiod[lowvol_circptr];
+ lowvol_perperiod[lowvol_circptr]= 0;
+
FOR_CONN(conn)
conn->since_activity++;
+
search_again:
FOR_CONN(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");
+ connfail(conn,"timed out waiting for response to QUIT (%s)",
+ conn->quitting);
else if (conn->sent.count)
connfail(conn,"timed out waiting for responses");
else if (conn->waiting.count || conn->priority.count)
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;
- }
- }
- }
+ else
+ conn_idle_close(conn, "no activity");
+
goto search_again;
}
+
+ conn= LIST_HEAD(conns);
+ if (!volthisperiod &&
+ conns.count==1 &&
+ lowvol_total < lowvol_thresh &&
+ !conn_busy(conn))
+ conn_idle_close(conn, "low volume");
}
/*---------- making new connections ----------*/
static void connect_attempt_discard(void) {
if (connecting_child) {
- int status= xwaitpid(&connecting_child, "connect");
+ int status= mwaitpid(&connecting_child, "connect");
if (!(WIFEXITED(status) ||
(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)))
report_child_status("connect", status);
}
if (connecting_fdpass_sock) {
cancel_fd_read_except(connecting_fdpass_sock);
- xclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
+ mclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
}
}
struct cmsghdr *h= 0;
if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
if (!h) {
- int status= xwaitpid(&connecting_child, "connect child (broken)");
+ int status= mwaitpid(&connecting_child, "connect child (broken)");
if (WIFEXITED(status)) {
if (WEXITSTATUS(status) != 0 &&
&peer_rd_err, conn);
if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
- notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
LIST_ADDHEAD(conns, conn);
+ notice("C%d (now %d) connected %s",
+ conn->fd, conns.count, conn->stream ? "streaming" : "plain");
connect_attempt_discard();
check_assign_articles();
x:
conn_dispose(conn);
connect_attempt_discard();
+ reconnect_blocking_event();
return OOP_CONTINUE;
}
assert(!connecting_fdpass_sock);
info("starting connection attempt");
+ int ok_until_connect= until_connect;
+ reconnect_blocking_event();
int socks[2];
int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
if (r) { syswarn("connect: cannot create socketpair for child"); return; }
- connecting_child= xfork("connection");
+ connecting_child= mfork("connection");
if (!connecting_child) {
FILE *cn_from, *cn_to;
char buf[NNTP_STRLEN+100];
int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
- xclose(socks[0], "(in child) parent's connection fdpass socket",0);
+ mclose(socks[0], "(in child) parent's connection fdpass socket",0);
alarm(connection_setup_timeout);
if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
_exit(exitstatus);
}
- xclose(socks[1], "connecting fdpass child's socket",0);
+ mclose(socks[1], "connecting fdpass child's socket",0);
connecting_fdpass_sock= socks[0];
- xsetnonblock(connecting_fdpass_sock, 1);
+ msetnonblock(connecting_fdpass_sock, 1);
on_fd_read_except(connecting_fdpass_sock, connchild_event);
+
+ if (!conns.count)
+ until_connect= ok_until_connect;
}
/*---------- assigning articles to conns, and transmitting ----------*/
Article *art= dequeue(0);
if (!art) break;
LIST_ADDTAIL(use->waiting, art);
+ lowvol_perperiod[lowvol_circptr]++;
spare--;
}
conn_maybe_write(use);
} else if (allow_connect_start()) {
- until_connect= reconnect_delay_periods;
connect_start();
break;
} else {
conn_make_some_xmits(conn);
if (!conn->xmitu) {
loop->cancel_fd(loop, conn->fd, OOP_WRITE);
+ conn->oopwriting= 0;
return;
}
void *rp= conn_write_some_xmits(conn);
if (rp==OOP_CONTINUE) {
- loop->on_fd(loop, conn->fd, OOP_WRITE, conn_writeable, conn);
+ if (!conn->oopwriting) {
+ loop->on_fd(loop, conn->fd, OOP_WRITE, conn_writeable, conn);
+ conn->oopwriting= 1;
+ }
return;
} else if (rp==OOP_HALT) {
return;
}
static void autodefer_input_file(InputFile *ipf) {
+ static const char *const abandon= "stuck";
ipf->autodefer= 0;
autodefer_input_file_articles(ipf);
if (has_article_in(&walk->waiting, ipf) ||
has_article_in(&walk->priority, ipf) ||
has_article_in(&walk->sent, ipf))
- walk->quitting= -1;
+ walk->quitting= abandon;
}
while (ipf->inprogress) {
FOR_CONN(walk)
- if (walk->quitting < 0) goto found;
+ if (walk->quitting == abandon) goto found;
abort(); /* where are they ?? */
found:
assert(rs > 0);
int done;
- for (done=0; rs && done<conn->xmitu; done++) {
+ for (done=0; rs; ) {
+ assert(done<conn->xmitu);
struct iovec *vp= &conn->xmit[done];
XmitDetails *dp= &conn->xmitd[done];
- if (rs > vp->iov_len) {
+ if (rs >= vp->iov_len) {
rs -= vp->iov_len;
- xmit_free(dp);
+ xmit_free(dp); /* vp->iov_len -= vp->iov_len, etc. */
+ done++;
} else {
vp->iov_base= (char*)vp->iov_base + rs;
vp->iov_len -= rs;
+ break; /* rs -= rs */
}
}
int newu= conn->xmitu - done;
return OOP_CONTINUE;
}
- int conn_busy=
- conn->waiting.count ||
- conn->priority.count ||
- conn->sent.count ||
- conn->xmitu;
+ int busy= conn_busy(conn);
if (conn->quitting) {
- if (code!=205 && code!=503) {
- connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
+ if (code!=205 && code!=400) {
+ connfail(conn, "peer gave unexpected response to QUIT (%s): %s",
+ conn->quitting, sani);
} else {
- notice("C%d idle connection closed by us", conn->fd);
- assert(!conn_busy);
LIST_REMOVE(conns,conn);
+ notice("C%d (now %d) idle connection closed (%s)",
+ conn->fd, conns.count, conn->quitting);
+ assert(!busy);
conn_dispose(conn);
}
return OOP_CONTINUE;
default: PEERBADMSG("peer sent unexpected message");
case 400:
- if (conn_busy)
+ if (busy)
PEERBADMSG("peer timed us out or stopped accepting articles");
- notice("C%d idle connection closed by peer", conn->fd);
LIST_REMOVE(conns,conn);
+ notice("C%d (now %d) idle connection closed by peer",
+ conns.count, conn->fd);
conn_dispose(conn);
return OOP_CONTINUE;
}
assert(fd>0);
- InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1);
+ InputFile *ipf= mmalloc(sizeof(*ipf) + strlen(path) + 1);
memset(ipf,0,sizeof(*ipf));
ipf->fd= fd;
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 */
- xclose_perhaps(&ipf->fd, "input file ", ipf->path);
+ mclose_perhaps(&ipf->fd, "input file ", ipf->path);
}
ipf->readcount_ok++;
- art= xmalloc(sizeof(*art) - 1 + midlen + 1);
+ art= mmalloc(sizeof(*art) - 1 + midlen + 1);
memset(art,0,sizeof(*art));
art->state= art_Unchecked;
art->midlen= midlen;
syswarn("filemon/inotify: inotify_init failed");
return 0;
}
- xsetnonblock(filemon_inotify_fd, 1);
+ msetnonblock(filemon_inotify_fd, 1);
loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable, 0);
debug("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd);
sysfatal("fcntl F_SETLK lockfile %s", path_lock);
}
- xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
+ mfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
int lock_noent;
- xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
+ mlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
if (!lock_noent && samefile(&stab, &stabf))
break;
- xclose(lockfd, "stale lockfile ", path_lock);
+ mclose(lockfd, "stale lockfile ", path_lock);
}
FILE *lockfile= fdopen(lockfd, "w");
search_backlog_file();
int defer_noent;
- xlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
+ mlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
if (defer_noent) {
debug("startup: ductdefer ENOENT");
} else {
open_defer(); /* so that we will later close it and rename it */
break;
case 2:
- xunlink(path_defer, "stale defer file link"
+ munlink(path_defer, "stale defer file link"
" (presumably hardlink to backlog file)");
break;
default:
int noent_f;
InputFile *file_d= open_input_file(path_flushing);
- if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
+ if (file_d) mfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
- xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
+ mlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
if (!noent_f && file_d && samefile(&stab_f, &stab_d)) {
debug("startup: F==D => Hardlinked");
- xunlink(feedfile, "feed file (during startup)"); /* => Moved */
+ munlink(feedfile, "feed file (during startup)"); /* => Moved */
noent_f= 1;
}
feedfile, path_flushing);
/* => Hardlinked */
- xunlink(feedfile, "old feedfile link");
+ munlink(feedfile, "old feedfile link");
/* => Moved */
spawn_inndcomm_flush(why); /* => Flushing FLUSHING */
#define CNT(art,rc) (ipf->counts[art_##art][RC_##rc])
char *inprog= completed
- ? xasprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
- : xasprintf(" inprogress=%ld", ipf->inprogress);
+ ? masprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
+ : masprintf(" inprogress=%ld", ipf->inprogress);
char *autodefer= ipf->autodefer >= 0
- ? xasprintf(" autodeferred=%ld", ipf->autodefer)
- : xasprintf("%s","");
+ ? masprintf(" autodeferred=%ld", ipf->autodefer)
+ : masprintf("%s","");
info("%s %s%s read=%d (+bl=%d,+err=%d)%s%s"
" missing=%d offered=%d (ch=%d,nc=%d) accepted=%d (ch=%d,nc=%d)"
close_defer();
- xunlink(path_flushing, "old flushing file");
+ munlink(path_flushing, "old flushing file");
close_input_file(flushing_input_file);
free(flushing_input_file);
/* truncate away any half-written records */
- xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
+ mfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
if (stab.st_size > LONG_MAX)
die("defer file %s size is far too large", path_defer);
return;
struct stat stab;
- xfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
+ mfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
if (fclose(defer)) sysfatal("could not close defer file %s", path_defer);
defer= 0;
- time_t now= xtime();
+ time_t now= mtime();
- char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile,
+ char *backlog= masprintf("%s_backlog_%lu.%lu", feedfile,
(unsigned long)now,
(unsigned long)stab.st_ino);
if (link(path_defer, backlog))
if (r && errno!=ENOENT)
syswarn("failed to unlink cli socket for old feed");
- xunlink(path_lock, "lockfile for old feed");
+ munlink(path_lock, "lockfile for old feed");
exit(4);
}
until_backlog_nextscan= backlog_spontrescan_periods;
goto xfree;
}
- now= xtime();
+ now= mtime();
double age= difftime(now, oldest_mtime);
long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
static sig_atomic_t terminate_sig_flag;
static void raise_default(int signo) {
- xsigsetdefault(signo);
+ msigsetdefault(signo);
raise(signo);
abort();
}
if (pipe(signal_self_pipe)) sysfatal("create self-pipe for signals");
- xsetnonblock(signal_self_pipe[0],1);
- xsetnonblock(signal_self_pipe[1],1);
+ msetnonblock(signal_self_pipe[0],1);
+ msetnonblock(signal_self_pipe[1],1);
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= sigarrived_handler;
sa.sa_flags= SA_RESTART;
- xsigaction(SIGTERM,&sa);
- xsigaction(SIGINT,&sa);
+ msigaction(SIGTERM,&sa);
+ msigaction(SIGINT,&sa);
on_fd_read_except(signal_self_pipe[0], sigarrived_event);
}
static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
assert(inndcomm_child);
assert(fd == inndcomm_sentinel_fd);
- int status= xwaitpid(&inndcomm_child, "inndcomm");
+ int status= mwaitpid(&inndcomm_child, "inndcomm");
inndcomm_child= 0;
cancel_fd_read_except(fd);
- xclose_perhaps(&fd, "inndcomm sentinel pipe",0);
+ mclose_perhaps(&fd, "inndcomm sentinel pipe",0);
inndcomm_sentinel_fd= 0;
assert(!flushing_input_file);
main_input_file= open_input_file(feedfile);
if (!main_input_file)
- die("flush succeeded but feedfile %s does not exist!", feedfile);
+ die("flush succeeded but feedfile %s does not exist!"
+ " (this probably means feedfile does not correspond"
+ " to site %s in newsfeeds)", feedfile, sitename);
if (flushing_input_file) {
- SMS(SEPARATED, max_separated_periods, "recovery flush complete");
+ SMS(SEPARATED, max_separated_periods, "flush complete");
} else {
close_defer();
- SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+ SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");
}
return OOP_CONTINUE;
if (pipe(pipefds)) sysfatal("create pipe for inndcomm child sentinel");
- inndcomm_child= xfork("inndcomm child");
+ inndcomm_child= mfork("inndcomm child");
if (!inndcomm_child) {
const char *flushargv[2]= { sitename, 0 };
char *reply;
int r;
- xclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
+ mclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
/* parent spots the autoclose of pipefds[1] when we die or exit */
if (simulate_flush>=0) {
simulate_flush= -1;
- xclose(pipefds[1], "inndcomm sentinel child's end",0);
+ mclose(pipefds[1], "inndcomm sentinel child's end",0);
inndcomm_sentinel_fd= pipefds[0];
assert(inndcomm_sentinel_fd);
on_fd_read_except(inndcomm_sentinel_fd, inndcomm_event);
static void postfork_inputfile(InputFile *ipf) {
if (!ipf) return;
- xclose(ipf->fd, "(in child) input file ", ipf->path);
+ mclose(ipf->fd, "(in child) input file ", ipf->path);
}
static void postfork_stdio(FILE *f, const char *what, const char *what2) {
static void postfork(void) {
in_child= 1;
- xsigsetdefault(SIGTERM);
- xsigsetdefault(SIGINT);
- xsigsetdefault(SIGPIPE);
+ msigsetdefault(SIGTERM);
+ msigsetdefault(SIGINT);
+ msigsetdefault(SIGPIPE);
if (terminate_sig_flag) raise(terminate_sig_flag);
postfork_inputfile(main_input_file);
static void *every_happens(oop_source *lp, struct timeval base, void *e_v) {
Every *e= e_v;
e->f();
- if (!e->fixed_rate) xgettimeofday(&base);
+ if (!e->fixed_rate) mgettimeofday(&base);
every_schedule(e, base);
return OOP_CONTINUE;
}
e->fixed_rate= fixed_rate;
e->f= f;
struct timeval now;
- xgettimeofday(&now);
+ mgettimeofday(&now);
every_schedule(e, now);
}
}
static char *debug_report_ipf(InputFile *ipf) {
- if (!ipf) return xasprintf("none");
+ if (!ipf) return masprintf("none");
const char *slash= strrchr(ipf->path,'/');
const char *path= slash ? slash+1 : ipf->path;
- return xasprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
+ return masprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
ipf, path,
ipf->queue.count, ipf->inprogress, ipf->autodefer,
(long)ipf->offset, ipf->fd,
debug("PERIOD"
" sms=%s[%d] conns=%d until_connect=%d"
" input_files main:%s flushing:%s backlog:%s[%d]"
- " children connecting=%ld inndcomm=%ld"
+ " children connecting=%ld inndcomm=%ld lowvol_total=%d"
,
sms_names[sms], until_flush, conns.count, until_connect,
dipf_main, dipf_flushing, dipf_backlog, until_backlog_nextscan,
- (long)connecting_child, (long)inndcomm_child
+ (long)connecting_child, (long)inndcomm_child, lowvol_total
);
free(dipf_main);
DUMPV("%d", , cli_master);
fprintf(f,"\n");
+ fprintf(f,"lowvol");
+ DUMPV("%d", , lowvol_circptr);
+ DUMPV("%d", , lowvol_total);
+ fprintf(f,":");
+ for (i=0; i<lowvol_periods; i++) {
+ fprintf(f," ");
+ if (i==lowvol_circptr) fprintf(f,"*");
+ fprintf(f,"%d",lowvol_perperiod[i]);
+ }
+ fprintf(f,"\n");
+
fprintf(f,"filemon ");
filemon_method_dump_info(f);
fprintf(f,"C%d",conn->fd);
DUMPV("%p",conn->,rd); DUMPV("%d",conn->,max_queue);
- DUMPV("%d",conn->,stream); DUMPV("%d",conn->,quitting);
+ DUMPV("%d",conn->,stream); DUMPV("\"%s\"",conn->,quitting);
DUMPV("%d",conn->,since_activity);
fprintf(f,"\n");
const XmitDetails *xd= &conn->xmitd[i];
char *dinfo;
switch (xd->kind) {
- case xk_Const: dinfo= xasprintf("Const"); break;
- case xk_Artdata: dinfo= xasprintf("A%p", xd->info.sm_art); break;
+ case xk_Const: dinfo= masprintf("Const"); break;
+ case xk_Artdata: dinfo= masprintf("A%p", xd->info.sm_art); break;
default:
abort();
}
static void vbadusage(const char *fmt, va_list al) NORET_PRINTF(1,0);
static void vbadusage(const char *fmt, va_list al) {
- char *m= xvasprintf(fmt,al);
+ char *m= mvasprintf(fmt,al);
fprintf(stderr, "bad usage: %s\n"
"say --help for help, or read the manpage\n",
m);
- if (become_daemon)
+ if (interactive < 2)
syslog(LOG_CRIT,"innduct: invoked with bad usage: %s",m);
exit(8);
}
const Option *o;
for (o=options; o->shrt || o->lng; o++) {
char shrt[2] = { o->shrt, 0 };
- char *optspec= xasprintf("%s%s%s%s%s",
+ char *optspec= masprintf("%s%s%s%s%s",
o->shrt ? "-" : "", shrt,
o->shrt && o->lng ? "|" : "",
DELIMPERHAPS("--", o->lng));
static const Option innduct_options[]= {
{'f',"feedfile", "F", &feedfile, op_string },
{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
-{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
+{0,"no-daemon", 0, &interactive, op_setint, 1 },
+{0,"interactive", 0, &interactive, op_setint, 2 },
{0,"no-streaming", 0, &try_stream, op_setint, 0 },
{0,"no-filemon", 0, &try_filemon, op_setint, 0 },
{'C',"inndconf", "F", &inndconffile, op_string },
{0,"max-flush-interval", "PERIOD", &spontaneous_flush_periods,op_seconds },
{0,"flush-finish-timeout", "PERIOD", &max_separated_periods, op_seconds },
{0,"idle-timeout", "PERIOD", &need_activity_periods, op_seconds },
+{0,"low-volume-thresh", "PERIOD", &lowvol_thresh, op_integer },
+{0,"low-volume-window", "PERIOD", &lowvol_periods, op_seconds },
{0,"max-bad-input-data-ratio","PERCENT", &max_bad_data_ratio, op_double },
{0,"max-bad-input-data-init", "PERCENT", &max_bad_data_initial, op_integer },
sitename= *argv++;
if (!sitename) badusage("need site name argument");
- remote_host= *argv++;
+
+ if (*argv) remote_host= *argv++;
+ else remote_host= sitename;
+
if (*argv) badusage("too many non-option arguments");
/* defaults */
convert_to_periods_rndup(&spontaneous_flush_periods);
convert_to_periods_rndup(&max_separated_periods);
convert_to_periods_rndup(&need_activity_periods);
+ convert_to_periods_rndup(&lowvol_periods);
if (max_bad_data_ratio < 0 || max_bad_data_ratio > 100)
badusage("bad input data ratio must be between 0..100");
if (!feedfile) feedfile= sitename;
if (!feedfile[0]) badusage("feed filename, if specified, must be nonempty");
if (path_ends_slash(feedfile))
- feedfile= xasprintf("%s%s", feedfile, sitename);
+ feedfile= masprintf("%s%s", feedfile, sitename);
if (feedfile[0] != '/')
- feedfile= xasprintf("%s/%s", innconf->pathoutgoing, feedfile);
+ feedfile= masprintf("%s/%s", innconf->pathoutgoing, feedfile);
if (!path_cli) {
path_cli_dir= "innduct";
} else if (!path_cli[0] || !strcmp(path_cli,"none")) {
path_cli= 0; /* ok, don't then */
} else if (path_ends_slash(path_cli)) {
- path_cli_dir= xasprintf("%.*s", strlen(path_cli)-1, path_cli);
+ path_cli_dir= masprintf("%.*s", strlen(path_cli)-1, path_cli);
}
if (path_cli_dir)
- path_cli= xasprintf("%s/%s", path_cli_dir, sitename);
+ path_cli= masprintf("%s/%s", path_cli_dir, sitename);
if (max_queue_per_ipf<0)
max_queue_per_ipf= max_queue_per_conn * 2;
if (strchr(feedfile, c))
badusage("feed filename may not contain metacharacter %c",c);
+ int i;
+ lowvol_perperiod= xcalloc(sizeof(*lowvol_perperiod), lowvol_periods);
+ for (i=0; i<lowvol_periods; i++) {
+ lowvol_perperiod[i]= lowvol_thresh;
+ lowvol_total += lowvol_thresh;
+ }
+ lowvol_total -= lowvol_thresh;
+
/* set things up */
- path_lock= xasprintf("%s_lock", feedfile);
- path_flushing= xasprintf("%s_flushing", feedfile);
- path_defer= xasprintf("%s_defer", feedfile);
- path_dump= xasprintf("%s_dump", feedfile);
- globpat_backlog= xasprintf("%s_backlog*", feedfile);
+ path_lock= masprintf("%s_lock", feedfile);
+ path_flushing= masprintf("%s_flushing", feedfile);
+ path_defer= masprintf("%s_defer", feedfile);
+ path_dump= masprintf("%s_dump", feedfile);
+ globpat_backlog= masprintf("%s_backlog*", feedfile);
oop_source_sys *sysloop= oop_sys_new();
if (!sysloop) sysdie("could not create liboop event loop");
LIST_INIT(conns);
- if (become_daemon) {
+ if (interactive < 1) {
int i;
for (i=3; i<255; i++)
/* do this now before we open syslog, etc. */
close(i);
+ }
+
+ if (interactive < 2)
openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS);
+ if (interactive < 1) {
int null= open("/dev/null",O_RDWR);
if (null<0) sysfatal("failed to open /dev/null");
dup2(null,0);
dup2(null,1);
dup2(null,2);
- xclose(null, "/dev/null original fd",0);
+ mclose(null, "/dev/null original fd",0);
- pid_t child1= xfork("daemonise first fork");
+ pid_t child1= mfork("daemonise first fork");
if (child1) _exit(0);
pid_t sid= setsid();
if (sid == -1) sysfatal("setsid failed");
- pid_t child2= xfork("daemonise second fork");
+ pid_t child2= mfork("daemonise second fork");
if (child2) _exit(0);
}
r= SMsetup(SM_PREOPEN, &val); if (!r) warn("SMsetup SM_PREOPEN failed");
r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
- if (!become_daemon)
+ if (interactive >= 2)
cli_stdio();
cli_init();
~ian / inn-innduct.git / blobdiff