d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove debug code for cpu usage

Browse Source 
I guess nobody used this in the last decade, and you can get
similar results with the time(1) command.
This commit is contained in:
Wolfram Schneider 2022-01-19 20:10:28 +00:00
parent cfa3856452
commit e0282802a6
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/locate/locate/Makefile
View File

@ -4,7 +4,7 @@
CONFS= locate.rc
PROG= locate
SRCS= util.c locate.c
CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
CFLAGS+= -I${.CURDIR} -DMMAP
SCRIPTS=updatedb.sh mklocatedb.sh concatdb.sh
MAN= locate.1 locate.updatedb.8

35
usr.bin/locate/locate/locate.c
View File

@ -97,15 +97,9 @@ static const char rcsid[] =
# include <fcntl.h>
#endif
#include "locate.h"
#include "pathnames.h"
#ifdef DEBUG
# include <sys/time.h>
# include <sys/types.h>
# include <sys/resource.h>
#endif
int f_mmap; /* use mmap */
int f_icase; /* ignore case */
@ -235,9 +229,6 @@ void
search_fopen(char *db, char **s)
{
FILE *fp;
#ifdef DEBUG
long t0;
#endif
/* can only read stdin once */
if (f_stdin) {
@ -259,9 +250,6 @@ search_fopen(char *db, char **s)
/* foreach search string ... */
while(*s != NULL) {
#ifdef DEBUG
t0 = cputime();
#endif
if (!f_stdin &&
fseek(fp, (long)0, SEEK_SET) == -1)
err(1, "fseek to begin of ``%s''\n", db);
@ -270,9 +258,6 @@ search_fopen(char *db, char **s)
fastfind_icase(fp, *s, db);
else
fastfind(fp, *s, db);
#ifdef DEBUG
warnx("fastfind %ld ms", cputime () - t0);
#endif
s++;
}
(void)fclose(fp);
@ -291,9 +276,6 @@ search_mmap(char *db, char **s)
int fd;
caddr_t p;
off_t len;
#ifdef DEBUG
long t0;
#endif
if ((fd = open(db, O_RDONLY)) == -1 ||
fstat(fd, &sb) == -1)
err(1, "`%s'", db);
@ -310,16 +292,10 @@ search_mmap(char *db, char **s)
/* foreach search string ... */
while (*s != NULL) {
#ifdef DEBUG
t0 = cputime();
#endif
if (f_icase)
fastfind_mmap_icase(*s, p, len, db);
else
fastfind_mmap(*s, p, len, db);
#ifdef DEBUG
warnx("fastfind %ld ms", cputime () - t0);
#endif
s++;
}
@ -330,17 +306,6 @@ search_mmap(char *db, char **s)
}
#endif /* MMAP */
#ifdef DEBUG
unsigned long
cputime ()
{
struct rusage rus;
getrusage(RUSAGE_SELF, &rus);
return(rus.ru_utime.tv_sec * 1000 + rus.ru_utime.tv_usec / 1000);
}
#endif /* DEBUG */
void
usage ()
{