From owner-svn-src-head@freebsd.org  Fri Dec  4 04:27:22 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0C62A409BA;
 Fri,  4 Dec 2015 04:27:22 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E88D1E17;
 Fri,  4 Dec 2015 04:27:22 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB44RLi2067656;
 Fri, 4 Dec 2015 04:27:21 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB44RL8S067654;
 Fri, 4 Dec 2015 04:27:21 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512040427.tB44RL8S067654@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 4 Dec 2015 04:27:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291744 - in head/sys: conf modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Dec 2015 04:27:22 -0000

Author: bdrewery
Date: Fri Dec  4 04:27:21 2015
New Revision: 291744
URL: https://svnweb.freebsd.org/changeset/base/291744

Log:
  Calculate MPATH for sys/modules to save 92% time in a basic 'obj' tree-walk.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/conf/kmod.mk
  head/sys/modules/Makefile

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Fri Dec  4 03:54:18 2015	(r291743)
+++ head/sys/conf/kmod.mk	Fri Dec  4 04:27:21 2015	(r291744)
@@ -370,8 +370,10 @@ vnode_if_typedef.h:
 .endif
 
 # Build _if.[ch] from _if.m, and clean them when we're done.
+# This is duplicated in sys/modules/Makefile.
 .if !defined(__MPATH)
 __MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
+.export __MPATH
 .endif
 _MFILES=${__MPATH:T:O}
 _MPATH=${__MPATH:H:O:u}

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Dec  4 03:54:18 2015	(r291743)
+++ head/sys/modules/Makefile	Fri Dec  4 04:27:21 2015	(r291744)
@@ -771,6 +771,12 @@ afterinstall:
 
 .include "${SYSDIR}/conf/config.mk"
 
+# Use sys/conf/kmod.mk's MPATH to avoid redundantly running in every subdir.
+.if !defined(__MPATH)
+__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
+.export __MPATH
+.endif
+
 SUBDIR:= ${SUBDIR:u:O}
 
 .include <bsd.subdir.mk>