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=-3.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham 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 9E7551F404 for ; Tue, 10 Apr 2018 12:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbeDJM4c (ORCPT ); Tue, 10 Apr 2018 08:56:32 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:34447 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbeDJM4b (ORCPT ); Tue, 10 Apr 2018 08:56:31 -0400 Received: by mail-pl0-f66.google.com with SMTP id y12-v6so7357181plt.1 for ; Tue, 10 Apr 2018 05:56:31 -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; bh=vr3liNPP+MiEVwDuCqglc4iyL+cIV41YUt0NhoZ2a8c=; b=Te+IQ+Jj6XDD6YZr8qy2lcACLAPgohzRaR811nsnBK0ml92My8gEsd5iHgmgulMeJp xlxtIzs0iCoIZ00vGHsg8BrQkl0h19mWNn0aU+3gk9oFaH032CK9koPjjWav6IgK9gou emi/Nq3z0OAJHnU6IdBsSij1GDSqlohWu2JW1oSplLE2RBhKUior6urnCOCItFmYeMQB zvgAPUt6K6PMcIVOUV6xHK8mWG4+ZgLWvCeBKjJ4iQZLKlIATZkXYIzmjzZCG++t/ObJ uMbLP45XqcS/1eOVbIywZZ89nTFoIAak3f+RZTtl3cXol9x9G8S3Bb8RYfSSxJ11igMr CZkw== 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; bh=vr3liNPP+MiEVwDuCqglc4iyL+cIV41YUt0NhoZ2a8c=; b=YAlCbElw1hx08ojBVS+UtRjUfHshEW16hUHuQ3T5BBUGlmIzCzmB9SnGS+gCj2kDzx LDIE895RPKkruOTuHgF9g4S9jtWUDirjzARq5xbzvHki+ENShpbIvWaQ1vxDSpmJlTLi lVoHCrD7imUYxBP0Qtl+CbcjJ1H0IHMmAK2jG0pzsojAxf71U3h8rxBH44koiD53mflK XDCjTCkobuKoB9bEYSWAKa09T9arJdIHgw7RTdfZaYX70UJfOgy0quXTc3A0pdHMBxMW HSqg2YM9GCkHi3Anmu8uisZrJVZ6bG1c6TSBtAFDxa81duNkTjVij4e5HYgk8aFR2/HV L2hA== X-Gm-Message-State: ALQs6tBbd+uXYkF7B5Shq1gHx0EhfL+JPQLbZV3XPDedB/TpsJWQH9Ay jLc1FNiVnX8vIxAS6Vpk1fRXUz6kRaM= X-Google-Smtp-Source: AIpwx49CJnq76HEBd7CCtMuqBcvuH2pxpU8tz9uSqMout6djGrG2duJllGN+WPwFcLCmAy0nieCxXw== X-Received: by 2002:a17:902:3001:: with SMTP id u1-v6mr348082plb.164.1523364991173; Tue, 10 Apr 2018 05:56:31 -0700 (PDT) Received: from stolee-linux-2.corp.microsoft.com ([2001:4898:8010:0:eb4a:5dff:fe0f:730f]) by smtp.gmail.com with ESMTPSA id l10sm4421666pgp.35.2018.04.10.05.56.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 05:56:30 -0700 (PDT) From: Derrick Stolee X-Google-Original-From: Derrick Stolee To: git@vger.kernel.org Cc: gitster@pobox.com, ramsay@ramsayjones.plus.com, sbeller@google.com, szeder.dev@gmail.com, git@jeffhostetler.com, peff@peff.net, Derrick Stolee Subject: [PATCH v8 02/14] csum-file: refactor finalize_hashfile() method Date: Tue, 10 Apr 2018 08:55:56 -0400 Message-Id: <20180410125608.39443-3-dstolee@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410125608.39443-1-dstolee@microsoft.com> References: <20180402203427.170177-1-dstolee@microsoft.com> <20180410125608.39443-1-dstolee@microsoft.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee If we want to use a hashfile on the temporary file for a lockfile, then we need finalize_hashfile() to fully write the trailing hash but also keep the file descriptor open. Do this by adding a new CSUM_HASH_IN_STREAM flag along with a functional change that checks this flag before writing the checksum to the stream. This differs from previous behavior since it would be written if either CSUM_CLOSE or CSUM_FSYNC is provided. Signed-off-by: Derrick Stolee --- builtin/pack-objects.c | 4 ++-- bulk-checkin.c | 2 +- csum-file.c | 8 ++++---- csum-file.h | 5 +++-- pack-bitmap-write.c | 2 +- pack-write.c | 5 +++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ab3e80ee49..b09bbf4f4c 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -837,9 +837,9 @@ static void write_pack_file(void) * If so, rewrite it like in fast-import */ if (pack_to_stdout) { - finalize_hashfile(f, oid.hash, CSUM_CLOSE); + finalize_hashfile(f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_CLOSE); } else if (nr_written == nr_remaining) { - finalize_hashfile(f, oid.hash, CSUM_FSYNC); + finalize_hashfile(f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); } else { int fd = finalize_hashfile(f, oid.hash, 0); fixup_pack_header_footer(fd, oid.hash, pack_tmp_name, diff --git a/bulk-checkin.c b/bulk-checkin.c index 227cc9f3b1..70b14fdf41 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -35,7 +35,7 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) unlink(state->pack_tmp_name); goto clear_exit; } else if (state->nr_written == 1) { - finalize_hashfile(state->f, oid.hash, CSUM_FSYNC); + finalize_hashfile(state->f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); } else { int fd = finalize_hashfile(state->f, oid.hash, 0); fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name, diff --git a/csum-file.c b/csum-file.c index e6c95a6915..53ce37f7ca 100644 --- a/csum-file.c +++ b/csum-file.c @@ -61,11 +61,11 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl the_hash_algo->final_fn(f->buffer, &f->ctx); if (result) hashcpy(result, f->buffer); - if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { - /* write checksum and close fd */ + if (flags & CSUM_HASH_IN_STREAM) flush(f, f->buffer, the_hash_algo->rawsz); - if (flags & CSUM_FSYNC) - fsync_or_die(f->fd, f->name); + if (flags & CSUM_FSYNC) + fsync_or_die(f->fd, f->name); + if (flags & CSUM_CLOSE) { if (close(f->fd)) die_errno("%s: sha1 file error on close", f->name); fd = 0; diff --git a/csum-file.h b/csum-file.h index 9ba87f0a6c..c5a2e335e7 100644 --- a/csum-file.h +++ b/csum-file.h @@ -27,8 +27,9 @@ extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *) extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *); /* finalize_hashfile flags */ -#define CSUM_CLOSE 1 -#define CSUM_FSYNC 2 +#define CSUM_CLOSE 1 +#define CSUM_FSYNC 2 +#define CSUM_HASH_IN_STREAM 4 extern struct hashfile *hashfd(int fd, const char *name); extern struct hashfile *hashfd_check(const char *name); diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 662b44f97d..db4c832428 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -535,7 +535,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index, if (options & BITMAP_OPT_HASH_CACHE) write_hash_cache(f, index, index_nr); - finalize_hashfile(f, NULL, CSUM_FSYNC); + finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); if (adjust_shared_perm(tmp_file.buf)) die_errno("unable to make temporary bitmap file readable"); diff --git a/pack-write.c b/pack-write.c index 044f427392..a9d46bc03f 100644 --- a/pack-write.c +++ b/pack-write.c @@ -170,8 +170,9 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec } hashwrite(f, sha1, the_hash_algo->rawsz); - finalize_hashfile(f, NULL, ((opts->flags & WRITE_IDX_VERIFY) - ? CSUM_CLOSE : CSUM_FSYNC)); + finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_CLOSE | + ((opts->flags & WRITE_IDX_VERIFY) + ? 0 : CSUM_FSYNC)); return index_name; } -- 2.17.0