xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git: size cache in bytes, not objects

Browse source 
git used to track cache size in object
count, rather than bytes. This had the
unfortunate effect of making memory use
depend on the size of objects -- repos
with lots of large objects could cause
out of memory deaths.

now, we track sizes in bytes, which should
keep our memory usage flatter.
This commit is contained in:
Ori Bernstein 2022-01-02 03:37:23 +00:00
parent 99d54e420e
commit f63d1d3ced
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/git/git.h
View file

@ -4,6 +4,7 @@
#include <flate.h>
#include <regexp.h>
typedef struct Capset Capset;
typedef struct Conn Conn;
typedef struct Hash Hash;
typedef struct Delta Delta;
@ -26,6 +27,8 @@ enum {
Npackcache = 32,
Hashsz = 20,
Pktmax = 65536,
KiB = 1024,
MiB = 1024*KiB,
};
enum {
@ -241,9 +244,9 @@ struct Delta {
extern Reprog *authorpat;
extern Objset objcache;
extern vlong cachemax;
extern Hash Zhash;
extern int chattygit;
extern int cachemax;
extern int interactive;
#pragma varargck type "H" Hash

8
sys/src/cmd/git/pack.c
View file

@ -65,8 +65,8 @@ static Object *readidxobject(Biobuf *, Hash, int);
Objset objcache;
Object *lruhead;
Object *lrutail;
int ncache;
int cachemax = 4096;
vlong ncache;
vlong cachemax = 512*MiB;
Packf *packf;
int npackf;
int openpacks;
@ -158,7 +158,7 @@ cache(Object *o)
if(!(o->flag & Ccache)){
o->flag |= Ccache;
ref(o);
ncache++;
ncache += o->size;
}
while(ncache > cachemax && lrutail != nil){
p = lrutail;
@ -168,8 +168,8 @@ cache(Object *o)
p->flag &= ~Ccache;
p->prev = nil;
p->next = nil;
ncache -= p->size;
unref(p);
ncache--;
}
}