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>

diff --git a/packfile.c b/packfile.c
index 0d191dfd608cf33602fd156c7ca1457c51953d53..0f46e06175de7fcc7fa32ed11374a11ad2f15172 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1,4 +1,5 @@
 #include "cache.h"
 #include "cache.h"

+#include "mru.h"

 
 char *odb_pack_name(struct strbuf *buf,
                    const unsigned char *sha1,
 
 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");
 }
        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 3c4a0dbd7c7128090b6e5d0be7ea0381f5b4ca06..a76bb7cec80c273a582d45e0885d53aa0e2ec72b 100644 (file)
--- 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 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
 #endif

diff --git a/sha1_file.c b/sha1_file.c
index 063409fe03ba1188a13de1857ca3f3fcc0e59913..d0033b980e1e23bef9e0cc60159338c909603cd8 100644 (file)
--- 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);
 }
 
        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,
 void pack_report(void)
 {
        fprintf(stderr,