Module Name: src
Committed By: rillig
Date: Sat Sep 5 18:31:03 UTC 2020
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make(1): make GetActuallyIncludingFile faster
In deeply nested includes, starting the search from the inner end is
faster since it needs fewer comparisons.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.281 src/usr.bin/make/parse.c:1.282
--- src/usr.bin/make/parse.c:1.281 Sat Sep 5 18:18:05 2020
+++ src/usr.bin/make/parse.c Sat Sep 5 18:31:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.281 2020/09/05 18:18:05 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.282 2020/09/05 18:31:03 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.281 2020/09/05 18:18:05 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.282 2020/09/05 18:31:03 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.281 2020/09/05 18:18:05 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.282 2020/09/05 18:31:03 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2343,17 +2343,16 @@ SetFilenameVars(const char *filename, co
static const char *
GetActuallyIncludingFile(void)
{
- const char *filename = NULL;
size_t i;
/* XXX: Stack was supposed to be an opaque data structure. */
- for (i = 0; i < includes.len; i++) {
- IFile *parent = includes.items[i];
- IFile *child = (i + 1 < includes.len) ? includes.items[i + 1] : curFile;
+ for (i = includes.len; i > 0; i--) {
+ IFile *parent = includes.items[i - 1];
+ IFile *child = (i < includes.len) ? includes.items[i] : curFile;
if (!child->fromForLoop)
- filename = parent->fname;
+ return parent->fname;
}
- return filename;
+ return NULL;
}
/* Set .PARSEDIR/.PARSEFILE to the given filename, as well as
