From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tay Ray Chuan Subject: [PATCH 08/23] http-walker: verify remote packs Date: Sat, 6 Jun 2009 16:43:34 +0800 Message-ID: <20090606164334.b25e538e.rctay89@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , Johannes Schindelin , Mike Hommey To: Git Mailing List X-From: git-owner@vger.kernel.org Sat Jun 06 10:49:32 2009 Return-path: 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 1MCram-0003qh-2Q for gcvg-git-2@gmane.org; Sat, 06 Jun 2009 10:49:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754221AbZFFItT (ORCPT ); Sat, 6 Jun 2009 04:49:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754183AbZFFItT (ORCPT ); Sat, 6 Jun 2009 04:49:19 -0400 Received: from mail-px0-f181.google.com ([209.85.216.181]:33895 "EHLO mail-px0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754075AbZFFItS (ORCPT ); Sat, 6 Jun 2009 04:49:18 -0400 Received: by mail-px0-f181.google.com with SMTP id 11so21643pxi.33 for ; Sat, 06 Jun 2009 01:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=ZdhmepjALGcaJF5K2YLjKb2yDprHQgmOtu+uGTLNdgU=; b=ALfrpC7MN8mORvEv7JFyDUgND8WSZjPCYK9ilQaeYAwFCxC7nD5+xpr72K/XVTOFrO i8brBTK8HmAmSbKUskWizTAWcZT/1dkOpMq52UAu8onrO9NGvy9LPyXYC5F7w0f/HHvx dAOaiqe4zxXri+zkHJUHkDtxvcYJWWMW1VhxY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; b=CrnW0ZEXrf0mqtKyfN2EiCryxeGB/qddI2yAp1LRCzKAaJHUbVva2gditGY1o8QIrs ZNT9rRzqlc8yyYap6fodLRuZokEf/a0cKqI72AYDOGzZ0SoBn71ceTw2Xe5O0ZWTfgik 8AvAH1BlNvOQIuzXUDAk6znWmGM4bG1SOWU0Q= Received: by 10.142.84.3 with SMTP id h3mr1540252wfb.237.1244278160884; Sat, 06 Jun 2009 01:49:20 -0700 (PDT) Received: from your-cukc5e3z5n (cm97.zeta149.maxonline.com.sg [116.87.149.97]) by mx.google.com with ESMTPS id 22sm2749046wfg.7.2009.06.06.01.49.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 06 Jun 2009 01:49:20 -0700 (PDT) In-Reply-To: X-Mailer: Sylpheed 2.6.0 (GTK+ 2.10.14; i686-pc-mingw32) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In c17fb6e ("Verify remote packs, speed up pending request queue"), changes were made to index fetching in http-push.c, particularly the methods fetch_index and setup_index. Since http-walker.c has similar code for index fetching, these improvements should apply to http-walker.c's fetch_index and setup_index. Invocations of free() of string memory are reproduced as well. Signed-off-by: Tay Ray Chuan --- http-walker.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/http-walker.c b/http-walker.c index 6ac1783..bbc3023 100644 --- a/http-walker.c +++ b/http-walker.c @@ -384,24 +384,48 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch struct active_request_slot *slot; struct slot_results results; - if (has_pack_index(sha1)) + /* Don't use the index if the pack isn't there */ + url = xmalloc(strlen(repo->base) + 64); + sprintf(url, "%s/objects/pack/pack-%s.pack", repo->base, hex); + slot = get_active_slot(); + slot->results = &results; + curl_easy_setopt(slot->curl, CURLOPT_URL, url); + curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1); + if (start_active_slot(slot)) { + run_active_slot(slot); + if (results.curl_result != CURLE_OK) { + free(url); + return error("Unable to verify pack %s is available", + hex); + } + } else { + free(url); + return error("Unable to start request"); + } + + if (has_pack_index(sha1)) { + free(url); return 0; + } if (walker->get_verbosely) fprintf(stderr, "Getting index for pack %s\n", hex); - url = xmalloc(strlen(repo->base) + 64); sprintf(url, "%s/objects/pack/pack-%s.idx", repo->base, hex); filename = sha1_pack_index_name(sha1); snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); indexfile = fopen(tmpfile, "a"); - if (!indexfile) + if (!indexfile) { + free(url); return error("Unable to open local file %s for pack index", tmpfile); + } slot = get_active_slot(); slot->results = &results; + curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0); + curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); curl_easy_setopt(slot->curl, CURLOPT_URL, url); @@ -426,17 +450,20 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch if (start_active_slot(slot)) { run_active_slot(slot); if (results.curl_result != CURLE_OK) { + free(url); fclose(indexfile); slot->local = NULL; return error("Unable to get pack index %s\n%s", url, curl_errorstr); } } else { + free(url); fclose(indexfile); slot->local = NULL; return error("Unable to start request"); } + free(url); fclose(indexfile); slot->local = NULL; -- 1.6.3.1