diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-01-05 20:26:27 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-01-05 20:26:27 +0000 |
| commit | f1da507fdd28f0ef6cf390c0be3a759d812fde8b (patch) | |
| tree | 44f79d233e003ad6cef81a350a22c69bbffba1d0 /usr.bin/mandoc/man.c | |
| parent | Don't use the first 64KB for anything, including tramps. Move tramps and (diff) | |
| download | wireguard-openbsd-f1da507fdd28f0ef6cf390c0be3a759d812fde8b.tar.xz wireguard-openbsd-f1da507fdd28f0ef6cf390c0be3a759d812fde8b.zip | |
Add an option -Q (quick) to mandocdb(8)
for accelerated generation of reduced-size databases.
Implement this by allowing the parsers to optionally
abort the parse sequence after the NAME section.
While here, garbage collect the unused void *arg attribute
of struct mparse and mparse_alloc().
This reduces the processing time of mandocdb(8) on /usr/share/man
by a factor of 2 and the database size by a factor of 4.
However, it still takes 5 times the time and 6 times the space
of makewhatis(8), so more work is clearly needed.
Diffstat (limited to 'usr.bin/mandoc/man.c')
| -rw-r--r-- | usr.bin/mandoc/man.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index 932590223b9..867e226645e 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,6 +1,7 @@ -/* $Id: man.c,v 1.72 2013/12/30 00:52:18 schwarze Exp $ */ +/* $Id: man.c,v 1.73 2014/01/05 20:26:27 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -93,7 +94,7 @@ man_free(struct man *man) struct man * -man_alloc(struct roff *roff, struct mparse *parse) +man_alloc(struct roff *roff, struct mparse *parse, int quick) { struct man *p; @@ -101,6 +102,7 @@ man_alloc(struct roff *roff, struct mparse *parse) man_hash_init(); p->parse = parse; + p->quick = quick; p->roff = roff; man_alloc1(p); @@ -600,6 +602,12 @@ man_pmacro(struct man *man, int ln, char *buf, int offs) if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) goto err; + /* In quick mode (for mandocdb), abort after the NAME section. */ + + if (man->quick && MAN_SH == tok && + strcmp(man->last->prev->child->string, "NAME")) + return(2); + /* * We weren't in a block-line scope when entering the * above-parsed macro, so return. |