#include "inn/list.h"
#include "inn/innconf.h"
+#include "inn/messages.h"
#include <sys/uio.h>
#include <sys/types.h>
#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
#define NORET __attribute__((__noreturn__))
-#define NEW(ptr) ((ptr)= zmmalloc(sizeof(*(ptr))))
-#define NEW_DECL(type,ptr) type ptr = zmmalloc(sizeof(*(ptr)))
+#define NEW(ptr) ((ptr)= zxmalloc(sizeof(*(ptr))))
+#define NEW_DECL(type,ptr) type ptr = zxmalloc(sizeof(*(ptr)))
#define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
static void search_backlog_file(void);
static void preterminate(void);
static void raise_default(int signo) NORET;
-static char *debug_report_ipf(InputFile *ipf);
static void inputfile_reading_start(InputFile *ipf);
static void inputfile_reading_stop(InputFile *ipf);
static double accept_proportion;
static int nocheck, nocheck_reported, in_child;
-/* for simulation, debugging, etc. */
+/* for logging, simulation, debugging, etc. */
int simulate_flush= -1;
+int logv_use_syslog;
+static char *logv_prefix="";
/*========== logging ==========*/
static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
static void logcore(int sysloglevel, const char *fmt, ...) {
VA;
- if (interactive < 2) {
+ if (logv_use_syslog) {
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 mvasprintf here or you'll recurse */
+ char msgbuf[1024]; /* NB do not call xvasprintf here or you'll recurse */
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
if (sysloglevel >= LOG_ERR && (errnoval==EACCES || errnoval==EPERM))
sysloglevel= LOG_ERR; /* run by wrong user, probably */
- logcore(sysloglevel, "<%s>%s: %s%s%s",
- sitename, pfx, msgbuf,
- errnoval>=0 ? ": " : "",
- errnoval>=0 ? strerror(errnoval) : "");
+ logcore(sysloglevel, "%s%s: %s%s%s",
+ logv_prefix, pfx, msgbuf,
+ errnoval>=0 ? ": " : "",
+ errnoval>=0 ? strerror(errnoval) : "");
}
-#define diewrap(fn, pfx, sysloglevel, err, estatus) \
+#define DEFFATAL(fn, pfx, sysloglevel, err, estatus) \
static void fn(const char *fmt, ...) NORET_PRINTF(1,2); \
static void fn(const char *fmt, ...) { \
preterminate(); \
exit(estatus); \
}
-#define logwrap(fn, pfx, sysloglevel, err) \
+#define DEFLOG(fn, pfx, sysloglevel, err) \
static void fn(const char *fmt, ...) PRINTF(1,2); \
static void fn(const char *fmt, ...) { \
VA; \
va_end(al); \
}
-#define INNLOGWRAP_DECLARE(fn, pfx, sysloglevel) \
- static void duct_log_##fn(int errval, const char *fmt, va_list al, int l) { \
- logv(sysloglevel, pfx, errnoval ? errnoval : -1, fmt, al); \
+#define INNLOGSET_DECLARE(fn, pfx, sysloglevel) \
+ static void duct_log_##fn(int l, const char *fmt, va_list al, int errval) { \
+ logv(sysloglevel, pfx, errval ? errval : -1, fmt, al); \
}
-#define INNLOGWRAP_CALL(fn, pfx, sysloglevel) \
- fn##_set_handlers(1, duct_log_##fn);
+#define INNLOGSET_CALL(fn, pfx, sysloglevel) \
+ message_handlers_##fn(1, duct_log_##fn);
static int innduct_fatal_cleanup(void) { return 12; } /* used for libinn die */
/* We want to extend the set of logging functions from inn, and we
* want to prepend the site name to all our messages. */
-diewrap(syscrash, " critical", LOG_CRIT, errno, 16);
-diewrap(crash, " critical", LOG_CRIT, -1, 16);
-
-diewrap(sysfatal, " fatal", LOG_ERR, errno, 12);
-diewrap(fatal, " fatal", LOG_ERR, -1, 12);
+DEFFATAL(syscrash, "critical", LOG_CRIT, errno, 16);
+DEFFATAL(crash, "critical", LOG_CRIT, -1, 16);
-#define INNLOGWRAPS \
- INNLOGWRAP(warn, " warning", LOG_WARNING, errno) \
- INNLOGWRAP(notice, " notice", LOG_NOTICE, -1)
-INNLOGWRAPS(INNLOGWRAP_DECLARE)
+#define INNLOGSETS(INNLOGSET) \
+ INNLOGSET(die, "fatal", LOG_ERR) \
+ INNLOGSET(warn, "warning", LOG_WARNING) \
+ INNLOGSET(notice, "notice", LOG_NOTICE) \
+ INNLOGSET(trace, "trace", LOG_NOTICE)
+INNLOGSETS(INNLOGSET_DECLARE)
-logwrap(info, " info", LOG_INFO, -1);
-logwrap(debug, " debug", LOG_DEBUG, -1);
+DEFLOG(info, "info", LOG_INFO, -1)
+DEFLOG(dbg, "debug", LOG_DEBUG, -1)
/*========== utility functions etc. ==========*/
-/* 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) {
+static char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
+static char *xvasprintf(const char *fmt, va_list al) {
char *str;
int rc= vasprintf(&str,fmt,al);
- if (rc<0) sysfatal("vasprintf(\"%s\",...) failed", fmt);
+ if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
return str;
}
-static char *masprintf(const char *fmt, ...) PRINTF(1,2);
-static char *masprintf(const char *fmt, ...) {
+static char *xasprintf(const char *fmt, ...) PRINTF(1,2);
+static char *xasprintf(const char *fmt, ...) {
VA;
- char *str= mvasprintf(fmt,al);
+ char *str= xvasprintf(fmt,al);
va_end(al);
return str;
}
*fd=0;
return r;
}
-static void mclose(int fd, const char *what, const char *what2) {
+static void xclose(int fd, const char *what, const char *what2) {
int r= close(fd);
if (r) syscrash("close %s%s",what,what2?what2:"");
}
-static void mclose_perhaps(int *fd, const char *what, const char *what2) {
+static void xclose_perhaps(int *fd, const char *what, const char *what2) {
if (*fd <= 0) return;
- mclose(*fd,what,what2);
+ xclose(*fd,what,what2);
*fd=0;
}
-static pid_t mfork(const char *what) {
+static pid_t xfork(const char *what) {
pid_t child;
child= fork();
- if (child==-1) sysfatal("cannot fork for %s",what);
- debug("forked %s %ld", what, (unsigned long)child);
+ if (child==-1) sysdie("cannot fork for %s",what);
+ dbg("forked %s %ld", what, (unsigned long)child);
if (!child) postfork();
return child;
}
}
}
-static int mwaitpid(pid_t *pid, const char *what) {
+static int xwaitpid(pid_t *pid, const char *what) {
int status;
int r= kill(*pid, SIGKILL);
return status;
}
-static void *mmalloc(size_t sz) {
- void *p= malloc(sz);
- if (!p) sysfatal("unable to malloc %lu bytes",(unsigned long)sz);
- return p;
-}
-
-static void *zmmalloc(size_t sz) {
- void *p= mmalloc(sz);
+static void *zxmalloc(size_t sz) {
+ void *p= xmalloc(sz);
memset(p,0,sz);
return p;
}
-static void munlink(const char *path, const char *what) {
+static void xunlink(const char *path, const char *what) {
int r= unlink(path);
if (r) syscrash("can't unlink %s %s", path, what);
}
-static time_t mtime(void) {
+static time_t xtime(void) {
time_t now= time(0);
if (now==-1) syscrash("time(2) failed");
return now;
}
-static void msigaction(int signo, const struct sigaction *sa) {
+static void xsigaction(int signo, const struct sigaction *sa) {
int r= sigaction(signo,sa,0);
if (r) syscrash("sigaction failed for \"%s\"", strsignal(signo));
}
-static void msigsetdefault(int signo) {
+static void xsigsetdefault(int signo) {
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= SIG_DFL;
- msigaction(signo,&sa);
+ xsigaction(signo,&sa);
}
-static void mgettimeofday(struct timeval *tv_r) {
+static void xgettimeofday(struct timeval *tv_r) {
int r= gettimeofday(tv_r,0);
if (r) syscrash("gettimeofday(2) failed");
}
-static void msetnonblock(int fd, int nonblocking) {
+static void xsetnonblock(int fd, int nonblocking) {
int errnoval= oop_fd_nonblock(fd, nonblocking);
if (errnoval) { errno= errnoval; syscrash("setnonblocking"); }
}
what, path, (unsigned long)stab->st_mode);
}
-static void mfstat(int fd, struct stat *stab_r, const char *what) {
+static void xfstat(int fd, struct stat *stab_r, const char *what) {
int r= fstat(fd, stab_r);
if (r) syscrash("could not fstat %s", what);
}
-static void mfstat_isreg(int fd, struct stat *stab_r,
+static void xfstat_isreg(int fd, struct stat *stab_r,
const char *path, const char *what) {
- mfstat(fd, stab_r, what);
+ xfstat(fd, stab_r, what);
check_isreg(stab_r, path, what);
}
-static void mlstat_isreg(const char *path, struct stat *stab,
+static void xlstat_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");
- msetnonblock(cli_master, 1);
+ xsetnonblock(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:
- mclose_perhaps(&cli_master, "cli master",0);
+ xclose_perhaps(&cli_master, "cli master",0);
return;
}
LIST_REMOVE(conns,conn);
- char *m= mvasprintf(fmt,al);
+ char *m= xvasprintf(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);
if (!todo) {
conn->quitting= why;
conn->since_activity= 0;
- debug("C%d is idle (%s), quitting", conn->fd, why);
+ dbg("C%d is idle (%s), quitting", conn->fd, why);
break;
}
}
static void connect_attempt_discard(void) {
if (connecting_child) {
- int status= mwaitpid(&connecting_child, "connect");
+ int status= xwaitpid(&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);
- mclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
+ xclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
}
}
struct cmsghdr *h= 0;
if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
if (!h) {
- int status= mwaitpid(&connecting_child, "connect child (broken)");
+ int status= xwaitpid(&connecting_child, "connect child (broken)");
if (WIFEXITED(status)) {
if (WEXITSTATUS(status) != 0 &&
case CONNCHILD_ESTATUS_STREAM: conn->stream= 1; break;
case CONNCHILD_ESTATUS_NOSTREAM: conn->stream= 0; break;
default:
- fatal("connect: child gave unexpected exit status %d", es);
+ die("connect: child gave unexpected exit status %d", es);
}
/* Phew! */
int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
if (r) { syswarn("connect: cannot create socketpair for child"); return; }
- connecting_child= mfork("connection");
+ connecting_child= xfork("connection");
if (!connecting_child) {
FILE *cn_from, *cn_to;
char buf[NNTP_STRLEN+100];
int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
- mclose(socks[0], "(in child) parent's connection fdpass socket",0);
+ xclose(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) {
--l;
}
if (!buf[0]) {
- sysfatal("connect: connection attempt failed");
+ sysdie("connect: connection attempt failed");
} else {
buf[l]= 0;
- fatal("connect: %s: %s", stripped ? "rejected" : "failed",
- sanitise(buf,-1));
+ die("connect: %s: %s", stripped ? "rejected" : "failed",
+ sanitise(buf,-1));
}
}
if (NNTPsendpassword((char*)remote_host, cn_from, cn_to) < 0)
- sysfatal("connect: authentication failed");
+ sysdie("connect: authentication failed");
if (try_stream) {
if (fputs("MODE STREAM\r\n", cn_to)==EOF ||
fflush(cn_to))
- sysfatal("connect: could not send MODE STREAM");
+ sysdie("connect: could not send MODE STREAM");
buf[sizeof(buf)-1]= 0;
if (!fgets(buf, sizeof(buf)-1, cn_from)) {
if (ferror(cn_from))
- sysfatal("connect: could not read response to MODE STREAM");
+ sysdie("connect: could not read response to MODE STREAM");
else
- fatal("connect: connection close in response to MODE STREAM");
+ die("connect: connection close in response to MODE STREAM");
}
int l= strlen(buf);
assert(l>=1);
if (buf[l-1]!='\n')
- fatal("connect: response to MODE STREAM is too long: %.100s...",
- sanitise(buf,-1));
+ die("connect: response to MODE STREAM is too long: %.100s...",
+ sanitise(buf,-1));
l--; if (l>0 && buf[l-1]=='\r') l--;
buf[l]= 0;
char *ep;
int rcode= strtoul(buf,&ep,10);
if (ep != &buf[3])
- fatal("connect: bad response to MODE STREAM: %.50s", sanitise(buf,-1));
+ die("connect: bad response to MODE STREAM: %.50s", sanitise(buf,-1));
switch (rcode) {
case 203:
_exit(exitstatus);
}
- mclose(socks[1], "connecting fdpass child's socket",0);
+ xclose(socks[1], "connecting fdpass child's socket",0);
connecting_fdpass_sock= socks[0];
- msetnonblock(connecting_fdpass_sock, 1);
+ xsetnonblock(connecting_fdpass_sock, 1);
on_fd_read_except(connecting_fdpass_sock, connchild_event);
if (!conns.count)
open_defer();
if (fprintf(defer, "%s %s\n", TokenToText(art->token), art->messageid) <0
|| fflush(defer))
- sysfatal("write to defer file %s",path_defer);
+ sysdie("write to defer file %s",path_defer);
article_done(art, whichcount);
}
notice("entering nocheck mode for the first time");
nocheck_reported= 1;
} else if (new_nocheck != nocheck) {
- debug("nocheck mode %s", new_nocheck ? "start" : "stop");
+ dbg("nocheck mode %s", new_nocheck ? "start" : "stop");
}
nocheck= new_nocheck;
}
int fd= open(path, O_RDWR);
if (fd<0) {
if (errno==ENOENT) return 0;
- sysfatal("unable to open input file %s", path);
+ sysdie("unable to open input file %s", path);
}
assert(fd>0);
- InputFile *ipf= mmalloc(sizeof(*ipf) + strlen(path) + 1);
+ InputFile *ipf= xmalloc(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 */
- mclose_perhaps(&ipf->fd, "input file ", ipf->path);
+ xclose_perhaps(&ipf->fd, "input file ", ipf->path);
}
ipf->readcount_ok++;
- art= mmalloc(sizeof(*art) - 1 + midlen + 1);
+ art= xmalloc(sizeof(*art) - 1 + midlen + 1);
memset(art,0,sizeof(*art));
art->state= art_Unchecked;
art->midlen= midlen;
static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) {
int wd= inotify_add_watch(filemon_inotify_fd, ipf->path, IN_MODIFY);
- if (wd < 0) sysfatal("inotify_add_watch %s", ipf->path);
+ if (wd < 0) sysdie("inotify_add_watch %s", ipf->path);
if (wd >= filemon_inotify_wdmax) {
int newmax= wd+2;
assert(!filemon_inotify_wd2ipf[wd]);
filemon_inotify_wd2ipf[wd]= ipf;
- debug("filemon inotify startfile %p wd=%d wdmax=%d",
- ipf, wd, filemon_inotify_wdmax);
+ dbg("filemon inotify startfile %p wd=%d wdmax=%d",
+ ipf, wd, filemon_inotify_wdmax);
pf->wd= wd;
}
static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) {
int wd= pf->wd;
- debug("filemon inotify stopfile %p wd=%d", ipf, wd);
+ dbg("filemon inotify stopfile %p wd=%d", ipf, wd);
int r= inotify_rm_watch(filemon_inotify_fd, wd);
if (r) syscrash("inotify_rm_watch");
filemon_inotify_wd2ipf[wd]= 0;
crash("inotify read %d bytes wanted struct of %d", r, (int)sizeof(iev));
}
InputFile *ipf= filemon_inotify_wd2ipf[iev.wd];
- /*debug("filemon inotify readable read %p wd=%d", ipf, iev.wd);*/
+ /*dbg("filemon inotify readable read %p wd=%d", ipf, iev.wd);*/
tailing_make_readable(ipf);
}
return OOP_CONTINUE;
syswarn("filemon/inotify: inotify_init failed");
return 0;
}
- msetnonblock(filemon_inotify_fd, 1);
+ xsetnonblock(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);
+ dbg("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd);
return 1;
}
for (;;) {
lockfd= open(path_lock, O_CREAT|O_RDWR, 0600);
- if (lockfd<0) sysfatal("open lockfile %s", path_lock);
+ if (lockfd<0) sysdie("open lockfile %s", path_lock);
struct flock fl;
memset(&fl,0,sizeof(fl));
if (r==-1) {
if (errno==EACCES || isewouldblock(errno)) {
if (quiet_multiple) exit(0);
- fatal("another duct holds the lockfile");
+ die("another duct holds the lockfile");
}
- sysfatal("fcntl F_SETLK lockfile %s", path_lock);
+ sysdie("fcntl F_SETLK lockfile %s", path_lock);
}
- mfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
+ xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
int lock_noent;
- mlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
+ xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
if (!lock_noent && samefile(&stab, &stabf))
break;
- mclose(lockfd, "stale lockfile ", path_lock);
+ xclose(lockfd, "stale lockfile ", path_lock);
}
FILE *lockfile= fdopen(lockfd, "w");
(unsigned long)self_pid,
sitename, feedfile, remote_host) == EOF ||
fflush(lockfile))
- sysfatal("write info to lockfile %s", path_lock);
+ sysdie("write info to lockfile %s", path_lock);
- debug("startup: locked");
+ dbg("startup: locked");
}
static void statemc_init(void) {
search_backlog_file();
int defer_noent;
- mlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
+ xlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
if (defer_noent) {
- debug("startup: ductdefer ENOENT");
+ dbg("startup: ductdefer ENOENT");
} else {
- debug("startup: ductdefer nlink=%ld", (long)stabdefer.st_nlink);
+ dbg("startup: ductdefer nlink=%ld", (long)stabdefer.st_nlink);
switch (stabdefer.st_nlink==1) {
case 1:
open_defer(); /* so that we will later close it and rename it */
break;
case 2:
- munlink(path_defer, "stale defer file link"
+ xunlink(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) mfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
+ if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
- mlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
+ xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
if (!noent_f && file_d && samefile(&stab_f, &stab_d)) {
- debug("startup: F==D => Hardlinked");
- munlink(feedfile, "feed file (during startup)"); /* => Moved */
+ dbg("startup: F==D => Hardlinked");
+ xunlink(feedfile, "feed file (during startup)"); /* => Moved */
noent_f= 1;
}
if (noent_f) {
- debug("startup: F ENOENT => Moved");
+ dbg("startup: F ENOENT => Moved");
if (file_d) startup_set_input_file(file_d);
spawn_inndcomm_flush("feedfile missing at startup");
/* => Flushing, sms:=FLUSHING */
} else {
if (file_d) {
- debug("startup: F!=D => Separated");
+ dbg("startup: F!=D => Separated");
startup_set_input_file(file_d);
flushing_input_file= main_input_file;
main_input_file= open_input_file(feedfile);
SMS(SEPARATED, max_separated_periods,
"found both old and current feed files");
} else {
- debug("startup: F exists, D ENOENT => Normal");
+ dbg("startup: F exists, D ENOENT => Normal");
InputFile *file_f= open_input_file(feedfile);
if (!file_f) crash("feed file vanished during startup");
startup_set_input_file(file_f);
static void statemc_start_flush(const char *why) { /* Normal => Flushing */
assert(sms == sm_NORMAL);
- debug("starting flush (%s) (%lu >?= %lu) (%d)",
+ dbg("starting flush (%s) (%lu >?= %lu) (%d)",
why,
(unsigned long)(main_input_file ? main_input_file->offset : 0),
(unsigned long)target_max_feedfile_size,
until_flush);
int r= link(feedfile, path_flushing);
- if (r) sysfatal("link feedfile %s to flushing file %s",
- feedfile, path_flushing);
+ if (r) sysdie("link feedfile %s to flushing file %s",
+ feedfile, path_flushing);
/* => Hardlinked */
- munlink(feedfile, "old feedfile link");
+ xunlink(feedfile, "old feedfile link");
/* => Moved */
spawn_inndcomm_flush(why); /* => Flushing FLUSHING */
#define CNT(art,rc) (ipf->counts[art_##art][RC_##rc])
char *inprog= completed
- ? masprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
- : masprintf(" inprogress=%ld", ipf->inprogress);
+ ? xasprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
+ : xasprintf(" inprogress=%ld", ipf->inprogress);
char *autodefer= ipf->autodefer >= 0
- ? masprintf(" autodeferred=%ld", ipf->autodefer)
- : masprintf("%s","");
+ ? xasprintf(" autodeferred=%ld", ipf->autodefer)
+ : xasprintf("%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();
- munlink(path_flushing, "old flushing file");
+ xunlink(path_flushing, "old flushing file");
close_input_file(flushing_input_file);
free(flushing_input_file);
static void *statemc_check_input_done(oop_source *lp, struct timeval now,
void *u) {
- assert(!inputfile_is_done(main_input_file));
+ /* main input file may be idle but if so that's because
+ * we haven't got to it yet, but that doesn't mean it's really done */
statemc_check_flushing_done();
statemc_check_backlog_done();
return OOP_CONTINUE;
if (defer) return;
defer= fopen(path_defer, "a+");
- if (!defer) sysfatal("could not open defer file %s", path_defer);
+ if (!defer) sysdie("could not open defer file %s", path_defer);
/* truncate away any half-written records */
- mfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
+ xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
if (stab.st_size > LONG_MAX)
crash("defer file %s size is far too large", path_defer);
path_defer, orgsize - truncto, orgsize, truncto);
if (fflush(defer))
- sysfatal("could not flush defer file %s", path_defer);
+ sysdie("could not flush defer file %s", path_defer);
if (ftruncate(fileno(defer), truncto))
syscrash("could not truncate defer file %s", path_defer);
return;
struct stat stab;
- mfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
+ xfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
- if (fclose(defer)) sysfatal("could not close defer file %s", path_defer);
+ if (fclose(defer)) sysdie("could not close defer file %s", path_defer);
defer= 0;
- time_t now= mtime();
+ time_t now= xtime();
- char *backlog= masprintf("%s_backlog_%lu.%lu", feedfile,
+ char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile,
(unsigned long)now,
(unsigned long)stab.st_ino);
if (link(path_defer, backlog))
- sysfatal("could not install defer file %s as backlog file %s",
- path_defer, backlog);
+ sysdie("could not install defer file %s as backlog file %s",
+ path_defer, backlog);
if (unlink(path_defer))
syscrash("could not unlink old defer link %s to backlog file %s",
path_defer, backlog);
switch (r) {
case GLOB_ABORTED:
- sysfatal("failed to expand backlog pattern %s", globpat_backlog);
+ sysdie("failed to expand backlog pattern %s", globpat_backlog);
case GLOB_NOSPACE:
- fatal("out of memory expanding backlog pattern %s", globpat_backlog);
+ die("out of memory expanding backlog pattern %s", globpat_backlog);
case 0:
for (i=0; i<gl.gl_pathc; i++) {
const char *path= gl.gl_pathv[i];
if (strchr(path,'#') || strchr(path,'~')) {
- debug("backlog file search skipping %s", path);
+ dbg("backlog file search skipping %s", path);
continue;
}
r= stat(path, &stab);
}
if (!oldest_path) {
- debug("backlog scan: none");
+ dbg("backlog scan: none");
if (sms==sm_DROPPED) {
preterminate();
if (r && errno!=ENOENT)
syswarn("failed to unlink cli socket for old feed");
- munlink(path_lock, "lockfile for old feed");
+ xunlink(path_lock, "lockfile for old feed");
exit(4);
}
until_backlog_nextscan= backlog_spontrescan_periods;
goto xfree;
}
- now= mtime();
+ now= xtime();
double age= difftime(now, oldest_mtime);
long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
if (age_deficiency <= 0) {
- debug("backlog scan: found age=%f deficiency=%ld oldest=%s",
+ dbg("backlog scan: found age=%f deficiency=%ld oldest=%s",
age, age_deficiency, oldest_path);
backlog_input_file= open_input_file(oldest_path);
until_backlog_nextscan > backlog_spontrescan_periods)
until_backlog_nextscan= backlog_spontrescan_periods;
- debug("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s",
+ dbg("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s",
age, age_deficiency, until_backlog_nextscan, oldest_path);
xfree:
static sig_atomic_t terminate_sig_flag;
static void raise_default(int signo) {
- msigsetdefault(signo);
+ xsigsetdefault(signo);
raise(signo);
abort();
}
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
syscrash("could not ignore SIGPIPE");
- if (pipe(signal_self_pipe)) sysfatal("create self-pipe for signals");
+ if (pipe(signal_self_pipe)) sysdie("create self-pipe for signals");
- msetnonblock(signal_self_pipe[0],1);
- msetnonblock(signal_self_pipe[1],1);
+ xsetnonblock(signal_self_pipe[0],1);
+ xsetnonblock(signal_self_pipe[1],1);
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= sigarrived_handler;
sa.sa_flags= SA_RESTART;
- msigaction(SIGTERM,&sa);
- msigaction(SIGINT,&sa);
+ xsigaction(SIGTERM,&sa);
+ xsigaction(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= mwaitpid(&inndcomm_child, "inndcomm");
+ int status= xwaitpid(&inndcomm_child, "inndcomm");
inndcomm_child= 0;
cancel_fd_read_except(fd);
- mclose_perhaps(&fd, "inndcomm sentinel pipe",0);
+ xclose_perhaps(&fd, "inndcomm sentinel pipe",0);
inndcomm_sentinel_fd= 0;
assert(!flushing_input_file);
assert(!inndcomm_child);
assert(!inndcomm_sentinel_fd);
- if (pipe(pipefds)) sysfatal("create pipe for inndcomm child sentinel");
+ if (pipe(pipefds)) sysdie("create pipe for inndcomm child sentinel");
- inndcomm_child= mfork("inndcomm child");
+ inndcomm_child= xfork("inndcomm child");
if (!inndcomm_child) {
const char *flushargv[2]= { sitename, 0 };
char *reply;
int r;
- mclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
+ xclose(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;
- mclose(pipefds[1], "inndcomm sentinel child's end",0);
+ xclose(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;
- mclose(ipf->fd, "(in child) input file ", ipf->path);
+ xclose(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;
- msigsetdefault(SIGTERM);
- msigsetdefault(SIGINT);
- msigsetdefault(SIGPIPE);
+ xsigsetdefault(SIGTERM);
+ xsigsetdefault(SIGINT);
+ xsigsetdefault(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) mgettimeofday(&base);
+ if (!e->fixed_rate) xgettimeofday(&base);
every_schedule(e, base);
return OOP_CONTINUE;
}
e->fixed_rate= fixed_rate;
e->f= f;
struct timeval now;
- mgettimeofday(&now);
+ xgettimeofday(&now);
every_schedule(e, now);
}
tailing_make_readable(flushing_input_file);
}
-static char *debug_report_ipf(InputFile *ipf) {
- if (!ipf) return masprintf("none");
+static char *dbg_report_ipf(InputFile *ipf) {
+ if (!ipf) return xasprintf("none");
const char *slash= strrchr(ipf->path,'/');
const char *path= slash ? slash+1 : ipf->path;
- return masprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
+ return xasprintf("%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,
}
static void period(void) {
- char *dipf_main= debug_report_ipf(main_input_file);
- char *dipf_flushing= debug_report_ipf(flushing_input_file);
- char *dipf_backlog= debug_report_ipf(backlog_input_file);
-
- debug("PERIOD"
- " sms=%s[%d] conns=%d until_connect=%d"
- " input_files main:%s flushing:%s backlog:%s[%d]"
- " 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, lowvol_total
- );
+ char *dipf_main= dbg_report_ipf(main_input_file);
+ char *dipf_flushing= dbg_report_ipf(flushing_input_file);
+ char *dipf_backlog= dbg_report_ipf(backlog_input_file);
+
+ dbg("PERIOD"
+ " sms=%s[%d] conns=%d until_connect=%d"
+ " input_files main:%s flushing:%s backlog:%s[%d]"
+ " 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, lowvol_total
+ );
free(dipf_main);
free(dipf_flushing);
static void dump_input_file(FILE *f, const CliCommand *c,
InputFile *ipf, const char *wh) {
- char *dipf= debug_report_ipf(ipf);
+ char *dipf= dbg_report_ipf(ipf);
fprintf(f,"input %s %s", wh, dipf);
free(dipf);
const XmitDetails *xd= &conn->xmitd[i];
char *dinfo;
switch (xd->kind) {
- case xk_Const: dinfo= masprintf("Const"); break;
- case xk_Artdata: dinfo= masprintf("A%p", xd->info.sm_art); break;
+ case xk_Const: dinfo= xasprintf("Const"); break;
+ case xk_Artdata: dinfo= xasprintf("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= mvasprintf(fmt,al);
+ char *m= xvasprintf(fmt,al);
fprintf(stderr, "bad usage: %s\n"
"say --help for help, or read the manpage\n",
m);
if (interactive < 2)
- syslog(LOG_CRASH,"innduct: invoked with bad usage: %s",m);
+ syslog(LOG_ERR,"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= masprintf("%s%s%s%s%s",
+ char *optspec= xasprintf("%s%s%s%s%s",
o->shrt ? "-" : "", shrt,
o->shrt && o->lng ? "|" : "",
DELIMPERHAPS("--", o->lng));
int main(int argc, char **argv) {
/* set up libinn logging */
- error_program_name= "innduct";
+ message_program_name= "innduct";
message_fatal_cleanup= innduct_fatal_cleanup;
- INNLOGWRAPS(INNLOGWRAP_CALL)
+ INNLOGSETS(INNLOGSET_CALL)
if (!argv[1]) {
printusage(stderr);
if (!feedfile) feedfile= sitename;
if (!feedfile[0]) badusage("feed filename, if specified, must be nonempty");
if (path_ends_slash(feedfile))
- feedfile= masprintf("%s%s", feedfile, sitename);
+ feedfile= xasprintf("%s%s", feedfile, sitename);
if (feedfile[0] != '/')
- feedfile= masprintf("%s/%s", innconf->pathoutgoing, feedfile);
+ feedfile= xasprintf("%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= masprintf("%.*s", strlen(path_cli)-1, path_cli);
+ path_cli_dir= xasprintf("%.*s", strlen(path_cli)-1, path_cli);
}
if (path_cli_dir)
- path_cli= masprintf("%s/%s", path_cli_dir, sitename);
+ path_cli= xasprintf("%s/%s", path_cli_dir, sitename);
if (max_queue_per_ipf<0)
max_queue_per_ipf= max_queue_per_conn * 2;
/* set things up */
- 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);
+ 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);
oop_source_sys *sysloop= oop_sys_new();
if (!sysloop) syscrash("could not create liboop event loop");
close(i);
}
- if (interactive < 2)
+ logv_prefix= xasprintf("<%s> ", sitename);
+ if (interactive < 2) {
openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS);
+ logv_use_syslog= 1;
+ }
if (interactive < 1) {
int null= open("/dev/null",O_RDWR);
- if (null<0) sysfatal("failed to open /dev/null");
+ if (null<0) sysdie("failed to open /dev/null");
dup2(null,0);
dup2(null,1);
dup2(null,2);
- mclose(null, "/dev/null original fd",0);
+ xclose(null, "/dev/null original fd",0);
- pid_t child1= mfork("daemonise first fork");
+ pid_t child1= xfork("daemonise first fork");
if (child1) _exit(0);
pid_t sid= setsid();
- if (sid == -1) sysfatal("setsid failed");
+ if (sid == -1) sysdie("setsid failed");
- pid_t child2= mfork("daemonise second fork");
+ pid_t child2= xfork("daemonise second fork");
if (child2) _exit(0);
}
if (self_pid==-1) syscrash("getpid");
r= chdir(path_run);
- if (r) sysfatal("could not chdir to pathrun %s", path_run);
+ if (r) sysdie("could not chdir to pathrun %s", path_run);
statemc_lock();
int val= 1;
r= SMsetup(SM_PREOPEN, &val); if (!r) warn("SMsetup SM_PREOPEN failed");
- r= SMinit(); if (!r) fatal("storage manager initialisation (SMinit) failed");
+ r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
if (interactive >= 2)
cli_stdio();
~ian / inn-innduct.git / blobdiff