JehanneOS/jehanne
JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

kern: rename /dev/swap in /dev/sysmem

Browse Source 
Jehanne has no SWAP.

And I do not want to explain to my daughters what SWAP **was**.
This commit is contained in:
Giacomo Tesio 2018-01-07 07:14:08 +01:00
parent 9cab16119a
commit 2bf39bf38a
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/src/cmd/stats.c
View File

@ -27,11 +27,11 @@ struct Graph
enum enum
{ {
/* old /dev/swap */ /* old /dev/sysmem */
Mem = 0, Mem = 0,
Maxmem, Maxmem,
Swap, Swap,
Maxswap, Maxsysmem,
Kern, Kern,
Maxkern, Maxkern,
@ -62,7 +62,7 @@ struct Machine
char *shortname; char *shortname;
int remote; int remote;
int statsfd; int statsfd;
int swapfd; int sysmemfd;
int etherfd; int etherfd;
int ifstatsfd; int ifstatsfd;
int batteryfd; int batteryfd;
@ -70,7 +70,7 @@ struct Machine
int tempfd; int tempfd;
int disable; int disable;
uint64_t devswap[8]; uint64_t devsysmem[8];
uint64_t devsysstat[10]; uint64_t devsysstat[10];
uint64_t prevsysstat[10]; uint64_t prevsysstat[10];
int nproc; int nproc;
@ -120,7 +120,7 @@ enum Menu2
Mintr, Mintr,
Mload, Mload,
Mmem, Mmem,
Mswap, Msysmem,
Mkern, Mkern,
Mdraw, Mdraw,
Msyscall, Msyscall,
@ -144,7 +144,7 @@ char *menu2strtpl[Nmenu2+1] = {
"add intr ", "add intr ",
"add load ", "add load ",
"add mem ", "add mem ",
"add swap ", "add sysmem ",
"add kern ", "add kern ",
"add draw ", "add draw ",
"add syscall ", "add syscall ",
@ -167,7 +167,7 @@ void contextval(Machine*, uint64_t*, uint64_t*, int),
loadval(Machine*, uint64_t*, uint64_t*, int), loadval(Machine*, uint64_t*, uint64_t*, int),
idleval(Machine*, uint64_t*, uint64_t*, int), idleval(Machine*, uint64_t*, uint64_t*, int),
memval(Machine*, uint64_t*, uint64_t*, int), memval(Machine*, uint64_t*, uint64_t*, int),
swapval(Machine*, uint64_t*, uint64_t*, int), sysmemval(Machine*, uint64_t*, uint64_t*, int),
kernval(Machine*, uint64_t*, uint64_t*, int), kernval(Machine*, uint64_t*, uint64_t*, int),
drawval(Machine*, uint64_t*, uint64_t*, int), drawval(Machine*, uint64_t*, uint64_t*, int),
syscallval(Machine*, uint64_t*, uint64_t*, int), syscallval(Machine*, uint64_t*, uint64_t*, int),
@ -192,7 +192,7 @@ void (*newvaluefn[Nmenu2])(Machine*, uint64_t*, uint64_t*, int init) = {
intrval, intrval,
loadval, loadval,
memval, memval,
swapval, sysmemval,
kernval, kernval,
drawval, drawval,
syscallval, syscallval,
@ -464,10 +464,10 @@ readnums(Machine *m, int n, uint64_t *a, int spanlines)
} }
int int
readswap(Machine *m, uint64_t *a) readsysmem(Machine *m, uint64_t *a)
{ {
if(strstr(m->buf, "memory\n")){ if(strstr(m->buf, "memory\n")){
/* new /dev/swap - skip first 3 numbers */ /* new /dev/sysmem - skip first 3 numbers */
if(!readnums(m, 5, a, 1)) if(!readnums(m, 5, a, 1))
return 0; return 0;
a[0] = a[3]; a[0] = a[3];
@ -569,10 +569,10 @@ initmach(Machine *m, char *name)
free(w); free(w);
} }
snprint(buf, sizeof buf, "%s/dev/swap", mpt); snprint(buf, sizeof buf, "%s/dev/sysmem", mpt);
m->swapfd = open(buf, OREAD); m->sysmemfd = open(buf, OREAD);
if(loadbuf(m, &m->swapfd) && readswap(m, a)) if(loadbuf(m, &m->sysmemfd) && readsysmem(m, a))
memmove(m->devswap, a, sizeof m->devswap); memmove(m->devsysmem, a, sizeof m->devsysmem);
snprint(buf, sizeof buf, "%s/dev/sysstat", mpt); snprint(buf, sizeof buf, "%s/dev/sysstat", mpt);
m->statsfd = open(buf, OREAD); m->statsfd = open(buf, OREAD);
@ -628,9 +628,9 @@ alarmed(void *a, char *s)
} }
int int
needswap(int init) needsysmem(int init)
{ {
return init | present[Mmem] | present[Mswap] | present[Mkern] | present[Mdraw]; return init | present[Mmem] | present[Msysmem] | present[Mkern] | present[Mdraw];
} }
@ -693,8 +693,8 @@ readmach(Machine *m, int init)
atnotify(alarmed, 1); atnotify(alarmed, 1);
alarm(5000); alarm(5000);
} }
if(needswap(init) && loadbuf(m, &m->swapfd) && readswap(m, a)) if(needsysmem(init) && loadbuf(m, &m->sysmemfd) && readsysmem(m, a))
memmove(m->devswap, a, sizeof m->devswap); memmove(m->devsysmem, a, sizeof m->devsysmem);
if(needstat(init) && loadbuf(m, &m->statsfd)){ if(needstat(init) && loadbuf(m, &m->statsfd)){
memmove(m->prevsysstat, m->devsysstat, sizeof m->devsysstat); memmove(m->prevsysstat, m->devsysstat, sizeof m->devsysstat);
memset(m->devsysstat, 0, sizeof m->devsysstat); memset(m->devsysstat, 0, sizeof m->devsysstat);
@ -725,17 +725,17 @@ readmach(Machine *m, int init)
void void
memval(Machine *m, uint64_t *v, uint64_t *vmax, int _) memval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
{ {
*v = m->devswap[Mem]; *v = m->devsysmem[Mem];
*vmax = m->devswap[Maxmem]; *vmax = m->devsysmem[Maxmem];
if(*vmax == 0) if(*vmax == 0)
*vmax = 1; *vmax = 1;
} }
void void
swapval(Machine *m, uint64_t *v, uint64_t *vmax, int _) sysmemval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
{ {
*v = m->devswap[Swap]; *v = m->devsysmem[Swap];
*vmax = m->devswap[Maxswap]; *vmax = m->devsysmem[Maxsysmem];
if(*vmax == 0) if(*vmax == 0)
*vmax = 1; *vmax = 1;
} }
@ -743,8 +743,8 @@ swapval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
void void
kernval(Machine *m, uint64_t *v, uint64_t *vmax, int _) kernval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
{ {
*v = m->devswap[Kern]; *v = m->devsysmem[Kern];
*vmax = m->devswap[Maxkern]; *vmax = m->devsysmem[Maxkern];
if(*vmax == 0) if(*vmax == 0)
*vmax = 1; *vmax = 1;
} }
@ -752,8 +752,8 @@ kernval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
void void
drawval(Machine *m, uint64_t *v, uint64_t *vmax, int _) drawval(Machine *m, uint64_t *v, uint64_t *vmax, int _)
{ {
*v = m->devswap[Draw]; *v = m->devsysmem[Draw];
*vmax = m->devswap[Maxdraw]; *vmax = m->devsysmem[Maxdraw];
if(*vmax == 0) if(*vmax == 0)
*vmax = 1; *vmax = 1;
} }
@ -1337,7 +1337,7 @@ main(int argc, char *argv[])
addgraph(Msignal); addgraph(Msignal);
break; break;
case 'w': case 'w':
addgraph(Mswap); addgraph(Msysmem);
break; break;
case 'k': case 'k':
addgraph(Mkern); addgraph(Mkern);

8
sys/src/kern/port/devcons.c
View File

@ -665,7 +665,7 @@ enum{
Qosversion, Qosversion,
Qrandom, Qrandom,
Qreboot, Qreboot,
Qswap, Qsysmem,
Qsysname, Qsysname,
Qsysstat, Qsysstat,
Qtime, Qtime,
@ -693,7 +693,7 @@ static Dirtab consdir[]={
"osversion", {Qosversion}, 0, 0444, "osversion", {Qosversion}, 0, 0444,
"random", {Qrandom}, 0, 0444, "random", {Qrandom}, 0, 0444,
"reboot", {Qreboot}, 0, 0664, "reboot", {Qreboot}, 0, 0664,
"swap", {Qswap}, 0, 0664, "sysmem", {Qsysmem}, 0, 0664,
"sysname", {Qsysname}, 0, 0664, "sysname", {Qsysname}, 0, 0664,
"sysstat", {Qsysstat}, 0, 0666, "sysstat", {Qsysstat}, 0, 0666,
"time", {Qtime}, NUMSIZE+3*VLNUMSIZE, 0664, "time", {Qtime}, NUMSIZE+3*VLNUMSIZE, 0664,
@ -985,7 +985,7 @@ consread(Chan *c, void *buf, long n, int64_t off)
poperror(); poperror();
return n; return n;
case Qswap: case Qsysmem:
memory_stats(&mstats); memory_stats(&mstats);
jehanne_snprint(tmp, sizeof tmp, jehanne_snprint(tmp, sizeof tmp,
"%llud memory\n" "%llud memory\n"
@ -1150,7 +1150,7 @@ conswrite(Chan *c, void *va, long n, int64_t off)
} }
break; break;
case Qswap: case Qsysmem:
/* no more */ /* no more */
break; break;