diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-08-18 15:20:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 15:12:06 -0700 |
| commit | 6d6a80e06893f391b4aaafa8829f1cb3a0ac23f6 (patch) | |
| tree | 3eb83242aeefbef11c436ee0437e088735646cc7 | |
| parent | 4f39cd821d1756f5f6d145f987576660136931ee (diff) | |
| download | git-6d6a80e06893f391b4aaafa8829f1cb3a0ac23f6.tar.gz | |
pack: move static state variables
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | packfile.c | 14 | ||||
| -rw-r--r-- | packfile.h | 9 | ||||
| -rw-r--r-- | sha1_file.c | 13 |
3 files changed, 23 insertions, 13 deletions
diff --git a/packfile.c b/packfile.c index 0d191dfd60..0f46e06175 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 3c4a0dbd7c..a76bb7cec8 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 063409fe03..d0033b980e 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -684,19 +684,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, |