From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH] gitweb: speed up project listing on large work trees by limiting find depth
Date: Wed, 17 Oct 2007 00:00:28 -0400
Message-ID: <20071017040028.GT13801@spearce.org>
References: <1192592725-28143-1-git-send-email-git@vicaya.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Cc: git@vger.kernel.org, pasky@suse.cz
To: Luke Lu <git@vicaya.com>
X-From: git-owner@vger.kernel.org Wed Oct 17 06:00:47 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1Ii05N-000476-EL
	for gcvg-git-2@gmane.org; Wed, 17 Oct 2007 06:00:45 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750720AbXJQEAe (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 17 Oct 2007 00:00:34 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750708AbXJQEAe
	(ORCPT <rfc822;git-outgoing>); Wed, 17 Oct 2007 00:00:34 -0400
Received: from corvette.plexpod.net ([64.38.20.226]:55073 "EHLO
	corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750700AbXJQEAd (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 17 Oct 2007 00:00:33 -0400
Received: from [74.70.48.173] (helo=asimov.home.spearce.org)
	by corvette.plexpod.net with esmtpa (Exim 4.68)
	(envelope-from <spearce@spearce.org>)
	id 1Ii04v-0001rj-E5; Wed, 17 Oct 2007 00:00:17 -0400
Received: by asimov.home.spearce.org (Postfix, from userid 1000)
	id C831F20FBAE; Wed, 17 Oct 2007 00:00:28 -0400 (EDT)
Content-Disposition: inline
In-Reply-To: <1192592725-28143-1-git-send-email-git@vicaya.com>
User-Agent: Mutt/1.5.11
X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
X-AntiAbuse: Primary Hostname - corvette.plexpod.net
X-AntiAbuse: Original Domain - vger.kernel.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - spearce.org
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/61327>

Luke Lu <git@vicaya.com> wrote:
> Resubmitting patch after passing gitweb regression tests.
...
> @@ -1519,6 +1524,11 @@ sub git_get_projects_list {
>  				return if (m!^[/.]$!);
>  				# only directories can be git repositories
>  				return unless (-d $_);
> +				# don't traverse too deep (Find is super slow on os x)
> +				if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) {
> +					$File::Find::prune = 1;
> +					return;
> +				}

Thanks.  I'm squashing this into your patch.  I'm not sure what
the impact is of altering $File::Find::name in the middle of the
find algorithm and I'm not sure we want to figure that out later.
We found out the hard way today that altering a non-local'd $_
in the function is what was causing the breakage.

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 48e21da..9f47c3f 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1525,7 +1525,8 @@ sub git_get_projects_list {
 				# only directories can be git repositories
 				return unless (-d $_);
 				# don't traverse too deep (Find is super slow on os x)
-				if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) {
+				local $_ = $File::Find::name;
+				if (tr!/!! - $pfxdepth > $project_maxdepth) {
 					$File::Find::prune = 1;
 					return;
 				}
-- 
Shawn.