dd5e4bc8dd
Bugs have been found in the fastmatch implementation as used in bsdgrep.
Some have been fixed (r316495) while fixes for others are in review
(D10098).
In comparison with the fastmatch implementation, Kyle Evans found that:
- regex(3)'s performance with literal expressions offers a speed
improvement over fastmatch
- regex(3)'s performance, both with simple BREs and EREs, seems to be
comparable
The regex implementation was imported in r226035, and the commit message
reports:
This is a temporary solution until the whole regex library is
not replaced so that BSD grep development can continue and the
backported code gets some review and testing. This change only
improves scalability slightly, there is no big performance boost
yet but several minor bugs have been found and fixed.
Introduce a WITH_/WITHOUT_BSD_GREP_FASTMATCH knob to support testing
of both approaches.
PR: 175314, 194823
Submitted by: Kyle Evans <kevans91 at ksu.edu>
Reviewed by: bdrewery (in part)
Differential Revision: https://reviews.freebsd.org/D10282
100 lines
2.0 KiB
Makefile
100 lines
2.0 KiB
Makefile
# $NetBSD: Makefile,v 1.4 2011/02/16 01:31:33 joerg Exp $
|
|
# $FreeBSD$
|
|
# $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
|
|
|
|
.include <src.opts.mk>
|
|
|
|
.if ${MK_BSD_GREP} == "yes"
|
|
PROG= grep
|
|
.else
|
|
PROG= bsdgrep
|
|
CLEANFILES+= bsdgrep.1
|
|
|
|
bsdgrep.1: grep.1
|
|
${CP} ${.ALLSRC} ${.TARGET}
|
|
.endif
|
|
SRCS= file.c grep.c queue.c util.c
|
|
|
|
.if ${MK_BSD_GREP_FASTMATCH} == "yes"
|
|
# Extra files ported backported for some regex improvements
|
|
.PATH: ${.CURDIR}/regex
|
|
SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c
|
|
CFLAGS+=-I${.CURDIR}/regex
|
|
.else
|
|
CFLAGS+= -DWITHOUT_FASTMATCH
|
|
.endif
|
|
|
|
CFLAGS.gcc+= --param max-inline-insns-single=500
|
|
|
|
.if ${MK_BSD_GREP} == "yes"
|
|
LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
|
|
${BINDIR}/grep ${BINDIR}/fgrep \
|
|
${BINDIR}/grep ${BINDIR}/rgrep \
|
|
${BINDIR}/grep ${BINDIR}/zgrep \
|
|
${BINDIR}/grep ${BINDIR}/zegrep \
|
|
${BINDIR}/grep ${BINDIR}/zfgrep
|
|
|
|
MLINKS= grep.1 egrep.1 \
|
|
grep.1 fgrep.1 \
|
|
grep.1 rgrep.1 \
|
|
grep.1 zgrep.1 \
|
|
grep.1 zegrep.1 \
|
|
grep.1 zfgrep.1
|
|
.endif
|
|
|
|
LIBADD= z
|
|
|
|
.if ${MK_LZMA_SUPPORT} != "no"
|
|
LIBADD+= lzma
|
|
|
|
.if ${MK_BSD_GREP} == "yes"
|
|
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
|
|
${BINDIR}/${PROG} ${BINDIR}/xzegrep \
|
|
${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
|
|
${BINDIR}/${PROG} ${BINDIR}/lzgrep \
|
|
${BINDIR}/${PROG} ${BINDIR}/lzegrep \
|
|
${BINDIR}/${PROG} ${BINDIR}/lzfgrep
|
|
|
|
MLINKS+= grep.1 xzgrep.1 \
|
|
grep.1 xzegrep.1 \
|
|
grep.1 xzfgrep.1 \
|
|
grep.1 lzgrep.1 \
|
|
grep.1 lzegrep.1 \
|
|
grep.1 lzfgrep.1
|
|
.endif
|
|
.else
|
|
CFLAGS+= -DWITHOUT_LZMA
|
|
.endif
|
|
|
|
.if ${MK_BZIP2_SUPPORT} != "no"
|
|
LIBADD+= bz2
|
|
|
|
.if ${MK_BSD_GREP} == "yes"
|
|
LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
|
|
${BINDIR}/grep ${BINDIR}/bzegrep \
|
|
${BINDIR}/grep ${BINDIR}/bzfgrep
|
|
MLINKS+= grep.1 bzgrep.1 \
|
|
grep.1 bzegrep.1 \
|
|
grep.1 bzfgrep.1
|
|
.endif
|
|
.else
|
|
CFLAGS+= -DWITHOUT_BZIP2
|
|
.endif
|
|
|
|
.if ${MK_GNU_GREP_COMPAT} != "no"
|
|
CFLAGS+= -I${DESTDIR}/usr/include/gnu
|
|
LIBADD+= gnuregex
|
|
.endif
|
|
|
|
.if ${MK_NLS} != "no"
|
|
.include "${.CURDIR}/nls/Makefile.inc"
|
|
.else
|
|
CFLAGS+= -DWITHOUT_NLS
|
|
.endif
|
|
|
|
.if ${MK_TESTS} != "no"
|
|
SUBDIR+= tests
|
|
.endif
|
|
|
|
.include <bsd.prog.mk>
|