From nobody Thu Jan 20 06:44:11 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C01121950DFD; Thu, 20 Jan 2022 06:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JfXzb4gZcz3km7; Thu, 20 Jan 2022 06:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642661051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgVUAGTE63QF62TtbBns6WT9WokkCT8Krm1ZQDX77Ec=; b=ug/qppnbOZKiiOVGg5kvMRwqmIoOEYKey2qkCGzSqCLgf4ipxlKFStZzp4QJOA3YzQP5fM 6ZbYvoVVjFIRm9XRY1Wc2yoV/Kq/pnTOEIK5HJ7AZSnAahhLdcQzdtcpUb4IiC2YAi2+72 RXS8kIPESYaxuk6GuHt5EcKSJ1bM3hyGtv4c9ZlPKalU2paRtpj7b94CeZwY2ATfZkDiqv P/JwRlH8brg70X4UOJiIJcsrOTH5V+pglMVoXkeEU8q9RVe/uIZwUIbEPNgXrwjO9PsX/w bzs1AAfkogE1hMb7OWGNsO8UUDZ3HfIj7lewzcG8VdLZjMbiFqqi1Zu5JBs1lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81EEC2392A; Thu, 20 Jan 2022 06:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20K6iB8L023031; Thu, 20 Jan 2022 06:44:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20K6iBfb023030; Thu, 20 Jan 2022 06:44:11 GMT (envelope-from git) Date: Thu, 20 Jan 2022 06:44:11 GMT Message-Id: <202201200644.20K6iBfb023030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: e0282802a6ec - main - remove debug code for cpu usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0282802a6eca08598c511d9d81aa407bd273cbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642661051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgVUAGTE63QF62TtbBns6WT9WokkCT8Krm1ZQDX77Ec=; b=m2u6A38Al8F19b8T68i6SbcWXIPq6i26yxJwhiPhpD0aWvDTMqDMh8XGq6T0VKhBR+ztH1 TzUwkHSbeG5+tf6Z21IfU6mopZB0NMMKRxzglOrVdsF6ZwjQ3wbSqtwvB8N2iXwQwREvd1 4A+PQzqZOBqeEUHQmE9SoU7yct9ryPYTOyCDogoloMk6oagAoJAluFofLW09tSv882Nb9l DLB56YKi920wOCu+FaY8GagA99sTeSsdQzbiNavjdjthrvH/Ya2sCBjdiQXKWRxHXdJtEQ V8X9JGvTGwPcIdcaGUj7qVl1qMGi7tshDFFqOuejWJK4Q+XZdac3Qo7P5W3qiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642661051; a=rsa-sha256; cv=none; b=iIYF/mS+xj/Pq/e8XLLe9+e3ZrPwKWndCtVLR+Hl19b7xJrYifKg7a/2le/KMYdbrZW8a8 pKFAkfkrtGhPgR91A9fhkS8V+n2o3GOXpFUpVUAGM4bj1327ZZ+3T0ar0WFBDUJc5wvIkN 31kSf+oCdwSfUYM9fh16MQBNYx/M068Kctw2rpxQNJ4lKc4/71cMATxyeOfa/Su9SJbRpl 3l2dpKoscDxpPSP7tw0w/vl0AnDBGMTkobYVvYODlR8YMinyqtekE2AW54lITYGj3U6EKB GohLPPrxeWgTbekAp6cqdMbXVG2Mcl7y4elZtb3dpiHQ+9qwTS9rn/859IWafw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e0282802a6eca08598c511d9d81aa407bd273cbe commit e0282802a6eca08598c511d9d81aa407bd273cbe Author: Wolfram Schneider AuthorDate: 2022-01-19 20:10:28 +0000 Commit: Wolfram Schneider CommitDate: 2022-01-20 06:43:54 +0000 remove debug code for cpu usage I guess nobody used this in the last decade, and you can get similar results with the time(1) command. --- usr.bin/locate/locate/Makefile | 2 +- usr.bin/locate/locate/locate.c | 35 ----------------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile index 7d56c57457c7..e2f5192d0b4a 100644 --- a/usr.bin/locate/locate/Makefile +++ b/usr.bin/locate/locate/Makefile @@ -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 diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index 3499591acabc..e65109819153 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -97,15 +97,9 @@ static const char rcsid[] = # include #endif - #include "locate.h" #include "pathnames.h" -#ifdef DEBUG -# include -# include -# include -#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 () {