From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 7B31B1FAE4 for ; Sun, 18 Mar 2018 14:25:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754360AbeCROZw (ORCPT ); Sun, 18 Mar 2018 10:25:52 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:46221 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754315AbeCROZp (ORCPT ); Sun, 18 Mar 2018 10:25:45 -0400 Received: by mail-lf0-f68.google.com with SMTP id j68-v6so1118017lfg.13 for ; Sun, 18 Mar 2018 07:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gwjhqkPltWw+wvRApx7Z+LtfEh5dMAa/W5sQ+CH7qic=; b=fq4fdZXzezggri4EW796pJI/X8aQ26+AHf4kIR6xzyir+7FsoPglNGgigk6zlWtCYx W5Eso5Ntqtuw5lJGQ7FnsnAwhS67eZ63FBlqBszAi6KRys80NgyRkOuw1tje0SGwHHKf eT77YxDbrpR3eJD7xHSQnar0Q4jcw1C/13XRgdjNQ77Wk0N4lvtk7XkpUn+k0s+12iOU 2m5HCk5Hn7vXJSupxBzORnOb/IuwYeDsnGjssNmQbMH+JlYMZCcsWAqIliEOEV7/6K+1 AchTjk+J4izs+xw2/OgcLDfeWjm0YU9RlcP2u0AY2a7tKLrI2jvSOVvTqHk1XwTfXsrD gYhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gwjhqkPltWw+wvRApx7Z+LtfEh5dMAa/W5sQ+CH7qic=; b=h8M2tyXNi77KQIjbu8xl9TiFTCCMqNHARnt1faVfrtZ4FPho72B7zqnfZE+i2oOAzO fEW/vZTjj3lDhRJZ/18zwkLX7AoZuefZKLN8ZA6hXp5WSh6fGFRjLQjbgmu/54444DX4 gDwOhXZgDFzajx+iIIN3m7HZ0XBzqPTZvMF4ucsjl7WkpztdqlVU1A5ts/s26qJKgHzR MRhUTLGv+UgWKASkAL0+9pkYf0Zpm7oac+I64L7JD7oIHx9MaBsBthFQDzrYKksZfpfN Lly+dXeA6kn5Swj8crPqQEPbWHYOJbJikGGVCUD+c2zM4B+4eoYRKwj4m/wYobczjTse n1wg== X-Gm-Message-State: AElRT7FKY/gM2dFUSFHsdlnK7go0Vno13kMI4hadMHVs9xI6nuv+/741 UfLIanVzSKWEZWnUnlSd9Xg= X-Google-Smtp-Source: AG47ELu8dom0UAKrw4stJRsau9qwlhRmvpgPYO69FLLgN8xamcvdvPQj/E+cYro7HC78YvLK7NQtrw== X-Received: by 2002:a19:db94:: with SMTP id t20-v6mr5698217lfi.39.1521383143902; Sun, 18 Mar 2018 07:25:43 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id n24sm2551554ljg.22.2018.03.18.07.25.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 07:25:43 -0700 (PDT) From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: pclouds@gmail.com Cc: avarab@gmail.com, e@80x24.org, git@vger.kernel.org, gitster@pobox.com, peff@peff.net Subject: [PATCH v6 04/11] pack-objects: use bitfield for object_entry::depth Date: Sun, 18 Mar 2018 15:25:19 +0100 Message-Id: <20180318142526.9378-5-pclouds@gmail.com> X-Mailer: git-send-email 2.17.0.rc0.347.gf9cf61673a In-Reply-To: <20180318142526.9378-1-pclouds@gmail.com> References: <20180317141033.21545-1-pclouds@gmail.com> <20180318142526.9378-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Because of struct packing from now on we can only handle max depth 4095 (or even lower when new booleans are added in this struct). This should be ok since long delta chain will cause significant slow down anyway. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 1 + Documentation/git-pack-objects.txt | 4 +++- Documentation/git-repack.txt | 4 +++- builtin/pack-objects.c | 4 ++++ pack-objects.h | 5 ++--- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index f57e9cf10c..9bd3f5a789 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2412,6 +2412,7 @@ pack.window:: pack.depth:: The maximum delta depth used by linkgit:git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. + Maximum value is 4095. pack.windowMemory:: The maximum size of memory that is consumed by each thread diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 81bc490ac5..3503c9e3e6 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -96,7 +96,9 @@ base-name:: it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for --window is 10 and --depth is 50. ++ +The default value for --window is 10 and --depth is 50. The maximum +depth is 4095. --window-memory=:: This option provides an additional limit on top of `--window`; diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index ae750e9e11..25c83c4927 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -90,7 +90,9 @@ other objects in that pack they already have locally. space. `--depth` limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. - The default value for --window is 10 and --depth is 50. ++ +The default value for --window is 10 and --depth is 50. The maximum +depth is 4095. --threads=:: This option is passed through to `git pack-objects`. diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 83f8154865..205e1f646c 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3068,6 +3068,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (pack_to_stdout != !base_name || argc) usage_with_options(pack_usage, pack_objects_options); + if (depth >= (1 << OE_DEPTH_BITS)) + die(_("delta chain depth %d is greater than maximum limit %d"), + depth, (1 << OE_DEPTH_BITS) - 1); + argv_array_push(&rp, "pack-objects"); if (thin) { use_internal_rev_list = 1; diff --git a/pack-objects.h b/pack-objects.h index 8507e1b869..59407aae3c 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -2,6 +2,7 @@ #define PACK_OBJECTS_H #define OE_DFS_STATE_BITS 2 +#define OE_DEPTH_BITS 12 /* * State flags for depth-first search used for analyzing delta cycles. @@ -89,9 +90,7 @@ struct object_entry { unsigned tagged:1; /* near the very tip of refs */ unsigned filled:1; /* assigned write-order */ unsigned dfs_state:OE_DFS_STATE_BITS; - - int depth; - + unsigned depth:OE_DEPTH_BITS; }; struct packing_data { -- 2.17.0.rc0.347.gf9cf61673a