diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-08-18 15:20:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 15:12:06 -0700 |
| commit | 8e21176c3cff203c1b991fda55df3ac7904d09fa (patch) | |
| tree | ff15441202af10c024be29e563ec03db66d03f17 | |
| parent | 6d6a80e06893f391b4aaafa8829f1cb3a0ac23f6 (diff) | |
| download | git-8e21176c3cff203c1b991fda55df3ac7904d09fa.tar.gz git-8e21176c3cff203c1b991fda55df3ac7904d09fa.tar.xz | |
pack: move pack_report()
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | packfile.c | 24 | ||||
| -rw-r--r-- | packfile.h | 2 | ||||
| -rw-r--r-- | sha1_file.c | 24 |
4 files changed, 26 insertions, 26 deletions
@@ -1626,8 +1626,6 @@ unsigned long approximate_object_count(void); extern struct packed_git *find_sha1_pack(const unsigned char *sha1, struct packed_git *packs); -extern void pack_report(void); - /* * Create a temporary file rooted in the object database directory, or * die on failure. The filename is taken from "pattern", which should have the diff --git a/packfile.c b/packfile.c index 0f46e0617..60d9fc3b0 100644 --- a/packfile.c +++ b/packfile.c @@ -35,3 +35,27 @@ struct packed_git *packed_git; static struct mru packed_git_mru_storage; struct mru *packed_git_mru = &packed_git_mru_storage; + +#define SZ_FMT PRIuMAX +static inline uintmax_t sz_fmt(size_t s) { return s; } + +void pack_report(void) +{ + fprintf(stderr, + "pack_report: getpagesize() = %10" SZ_FMT "\n" + "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n" + "pack_report: core.packedGitLimit = %10" SZ_FMT "\n", + sz_fmt(getpagesize()), + sz_fmt(packed_git_window_size), + sz_fmt(packed_git_limit)); + fprintf(stderr, + "pack_report: pack_used_ctr = %10u\n" + "pack_report: pack_mmap_calls = %10u\n" + "pack_report: pack_open_windows = %10u / %10u\n" + "pack_report: pack_mapped = " + "%10" SZ_FMT " / %10" SZ_FMT "\n", + pack_used_ctr, + pack_mmap_calls, + pack_open_windows, peak_pack_open_windows, + sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped)); +} diff --git a/packfile.h b/packfile.h index a76bb7cec..bfa94c8fe 100644 --- a/packfile.h +++ b/packfile.h @@ -33,4 +33,6 @@ extern unsigned int pack_max_fds; extern size_t peak_pack_mapped; extern size_t pack_mapped; +extern void pack_report(void); + #endif diff --git a/sha1_file.c b/sha1_file.c index d0033b980..4895f45b5 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -30,9 +30,6 @@ #include "quote.h" #include "packfile.h" -#define SZ_FMT PRIuMAX -static inline uintmax_t sz_fmt(size_t s) { return s; } - const unsigned char null_sha1[20]; const struct object_id null_oid; const struct object_id empty_tree_oid = { @@ -684,27 +681,6 @@ static int has_loose_object(const unsigned char *sha1) return check_and_freshen(sha1, 0); } -void pack_report(void) -{ - fprintf(stderr, - "pack_report: getpagesize() = %10" SZ_FMT "\n" - "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n" - "pack_report: core.packedGitLimit = %10" SZ_FMT "\n", - sz_fmt(getpagesize()), - sz_fmt(packed_git_window_size), - sz_fmt(packed_git_limit)); - fprintf(stderr, - "pack_report: pack_used_ctr = %10u\n" - "pack_report: pack_mmap_calls = %10u\n" - "pack_report: pack_open_windows = %10u / %10u\n" - "pack_report: pack_mapped = " - "%10" SZ_FMT " / %10" SZ_FMT "\n", - pack_used_ctr, - pack_mmap_calls, - pack_open_windows, peak_pack_open_windows, - sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped)); -} - /* * Open and mmap the index file at path, perform a couple of * consistency checks, then record its information to p. Return 0 on |