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

venti: fix detection of available RAM (fixes -m)

Browse source
This commit is contained in:
Noam Preil 2021-06-21 03:52:09 +00:00
parent a22697039d
commit e7715ce2c6
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/src/cmd/venti/srv/venti.c
View file

@ -35,7 +35,7 @@ freemem(void)
Biobuf *bp; Biobuf *bp;
size = 64*1024*1024; size = 64*1024*1024;
bp = Bopen("#c/swap", OREAD); bp = Bopen("/dev/swap", OREAD);
if (bp != nil) { if (bp != nil) {
while ((ln = Brdline(bp, '\n')) != nil) { while ((ln = Brdline(bp, '\n')) != nil) {
ln[Blinelen(bp)-1] = '\0'; ln[Blinelen(bp)-1] = '\0';
@ -57,8 +57,17 @@ freemem(void)
size = (userpgs - userused) * pgsize; size = (userpgs - userused) * pgsize;
} }
/* cap it to keep the size within 32 bits */ /* cap it to keep the size within 32 bits */
if (size >= 3840UL * 1024 * 1024) if (size >= 3840UL * 1024 * 1024){
size = 3840UL * 1024 * 1024; size = 3840UL * 1024 * 1024;
fprint(2, "%s: Reduced free memory detected to 3840MiB because we don't support 64-bit addresses yet.\n", argv0);
}
/* FIXME: we use signed 32-bit integers in some places for some fucking reason.
Limiting accordingly for now.
*/
if (size >= 2047UL * 1024 * 1024){
size = 2047UL * 1024 * 1024;
fprint(2, "%s: Reduced free memory detected to 2047MiB because we have bugz.\n", argv0);
}
return size; return size;
} }
@ -97,9 +106,9 @@ allocbypcnt(u32int mempcnt, u32int stfree)
fprint(2, "%s: bloom filter bigger than mem pcnt; " fprint(2, "%s: bloom filter bigger than mem pcnt; "
"resorting to minimum values (9MB total)\n", argv0); "resorting to minimum values (9MB total)\n", argv0);
else { else {
if (avail >= 3840UL * 1024 * 1024){ if (avail >= 2047UL * 1024 * 1024){
avail = 3840UL * 1024 * 1024; /* sanity */ avail = 2047UL * 1024 * 1024; /* sanity */
fprint(2, "%s: restricting memory usage to 3840MiB\n", argv0); fprint(2, "%s: restricting memory usage to 2047MiB\n", argv0);
} }
avail /= 2; avail /= 2;
all.icmem = avail; all.icmem = avail;