admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pack: move static state variables

Browse Source 
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>
This commit is contained in:
Jonathan Tan
2017-08-18 15:20:17 -07:00
committed by Junio C Hamano
parent 4f39cd821d
commit 6d6a80e068
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packfile.c
View File

@@ -1,4 +1,5 @@
#include "cache.h" #include "cache.h"
#include "mru.h"
char *odb_pack_name(struct strbuf *buf, char *odb_pack_name(struct strbuf *buf,
const unsigned char *sha1, const unsigned char *sha1,
@@ -21,3 +22,16 @@ char *sha1_pack_index_name(const unsigned char *sha1)
static struct strbuf buf = STRBUF_INIT; static struct strbuf buf = STRBUF_INIT;
return odb_pack_name(&buf, sha1, "idx"); 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;

9
packfile.h
View File

@@ -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

13
sha1_file.c
View File

@@ -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) void pack_report(void)
{ {
fprintf(stderr, fprintf(stderr,