diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/binlog.c | 44 | ||||
| -rw-r--r-- | src/pack.c | 24 | ||||
| -rw-r--r-- | src/pack.h | 1 |
3 files changed, 42 insertions, 27 deletions
diff --git a/src/binlog.c b/src/binlog.c index b2d9f87..325f337 100644 --- a/src/binlog.c +++ b/src/binlog.c @@ -45,29 +45,29 @@ enum binlog_state { }; struct binlog_config { - size_t size; /* maximum file size */ - unsigned interval; /* file rotation interval */ - char *pattern; /* file name pattern */ - int umask; /* umask for new files and directories */ - char *dir; /* root storage directory */ - int dd; /* directory descriptor */ - char *fname; /* current file name */ - int fd; /* current file descriptor */ + size_t size; /* maximum file size */ + unsigned interval; /* file rotation interval */ + char *pattern; /* file name pattern */ + int umask; /* umask for new files and directories */ + char *dir; /* root storage directory */ + int dd; /* directory descriptor */ + char *fname; /* current file name */ + int fd; /* current file descriptor */ struct binlog_file_header *base; /* mmap base */ - char *recbase; /* record base */ - size_t recnum; /* number of records in recbase */ - size_t recsize; /* record size */ - time_t stoptime; /* when to rotate the current file */ + char *recbase; /* record base */ + size_t recnum; /* number of records in recbase */ + size_t recsize; /* record size */ + time_t stoptime; /* when to rotate the current file */ pthread_mutex_t mutex; - int debug; - int flags; - - char *dataspec; - struct packinst *inst_head; - struct packinst *inst_cur; - struct packenv *env; - enum binlog_state state; - time_t timestamp; + int debug; /* debug level */ + int flags; /* flags (see BLF_* defines above) */ + + char *dataspec; /* data format specification */ + struct packinst *inst_head; /* compiled dataspec */ + struct packinst *inst_cur; /* current instruction */ + struct packenv *env; /* pack environment */ + enum binlog_state state; /* binlog machine state */ + time_t timestamp; /* timestamp for the entry being built */ }; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; @@ -496,7 +496,7 @@ vmod_start(struct sess *sp, struct vmod_priv *priv) packenv_init(conf->env); conf->state = state_start; - conf->inst_cur = conf->inst_head; + conf->inst_cur = packinit(conf->inst_head); conf->timestamp = ts; } @@ -69,6 +69,7 @@ struct packinst { struct packinst *next; struct packspec *spec; int rep; + int cur; }; static char * @@ -509,10 +510,12 @@ packinnext(struct packinst *pi, struct packenv *env) return NULL; if (pi->spec->flags & F_REP) pi->spec->packer(env, pi->spec, pi->rep); - else - for (i = 0; i < pi->rep; i++) - pi->spec->packer(env, pi->spec, 1); - return pi->next; + else { + pi->spec->packer(env, pi->spec, 1); + if (++pi->cur < pi->rep) + return pi; + } + return packinit(pi->next); } void @@ -524,8 +527,11 @@ packout(struct packinst *pi, struct packenv *env) if (pi->spec->flags & F_REP) pi->spec->unpacker(env, pi->spec, pi->rep); else - for (i = 0; i < pi->rep; i++) + for (i = 0; i < pi->rep; i++) { + if (i > 0) + fputc(' ', env->fp); pi->spec->unpacker(env, pi->spec, 1); + } if (pi->next) fputc(' ', env->fp); } @@ -541,6 +547,14 @@ packsize(struct packinst *pi) return env.buf_pos; } +struct packinst * +packinit(struct packinst *inst) +{ + if (inst) + inst->cur = 0; + return inst; +} + struct packenv * packenv_create(size_t size) { @@ -30,6 +30,7 @@ struct packinst; struct packinst *packcomp(const char *s, char **endp); void packfree(struct packinst *pi); +struct packinst *packinit(struct packinst *pi); void packin(struct packinst *pi, struct packenv *env); void packout(struct packinst *pi, struct packenv *env); struct packinst *packinnext(struct packinst *pi, struct packenv *env); |