[PATCH v3 02/23] pack: move static state variables
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Aug 18, 2017, 22:20 UTC
- Message-ID
- <46e6295fd5c651834a1ef8abc2c716e6c9ce8c3f.1503094448.git.jonathantanmy@google.com>
- In-Reply-To
- <cover.1503094448.git.jonathantanmy@google.com>
sha1_file.c declares some static variables that store packfile-related state. Move them to packfile.c.
They are temporarily made global, but subsequent commits will restore their scope back to static.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- packfile.c | 14 ++++++++++++++ packfile.h | 9 +++++++++ sha1_file.c | 13 ------------- 3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/packfile.c b/packfile.c index 0d191dfd6..0f46e0617 100644 --- a/packfile.c +++ b/packfile.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "mru.h" char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, @@ -21,3 +22,16 @@ char *sha1_pack_index_name(const unsigned char *sha1) static struct strbuf buf = STRBUF_INIT; return odb_pack_name(&buf, sha1, "idx"); } + +unsigned int pack_used_ctr; +unsigned int pack_mmap_calls; +unsigned int peak_pack_open_windows; +unsigned int pack_open_windows; +unsigned int pack_open_fds; +unsigned int pack_max_fds; +size_t peak_pack_mapped; +size_t pack_mapped; +struct packed_git *packed_git; + +static struct mru packed_git_mru_storage; +struct mru *packed_git_mru = &packed_git_mru_storage; diff --git a/packfile.h b/packfile.h index 3c4a0dbd7..a76bb7cec 100644 --- a/packfile.h +++ b/packfile.h @@ -24,4 +24,13 @@ extern char *sha1_pack_name(const unsigned char *sha1); */ extern char *sha1_pack_index_name(const unsigned char *sha1); +extern unsigned int pack_used_ctr; +extern unsigned int pack_mmap_calls; +extern unsigned int peak_pack_open_windows; +extern unsigned int pack_open_windows; +extern unsigned int pack_open_fds; +extern unsigned int pack_max_fds; +extern size_t peak_pack_mapped; +extern size_t pack_mapped; + #endif diff --git a/sha1_file.c b/sha1_file.c index 6e7a20b52..2b5ce9959 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -683,19 +683,6 @@ static int has_loose_object(const unsigned char *sha1) return check_and_freshen(sha1, 0); } -static unsigned int pack_used_ctr; -static unsigned int pack_mmap_calls; -static unsigned int peak_pack_open_windows; -static unsigned int pack_open_windows; -static unsigned int pack_open_fds; -static unsigned int pack_max_fds; -static size_t peak_pack_mapped; -static size_t pack_mapped; -struct packed_git *packed_git; - -static struct mru packed_git_mru_storage; -struct mru *packed_git_mru = &packed_git_mru_storage; - void pack_report(void) { fprintf(stderr,
-- 2.14.1.480.gb18f417b89-goog