Plan 9 from Bell Labs 2005-09-30

dist/replica/_plan9.db

@@ -5764,7 +5764,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1127394114 256007
+sys/games/lib/fortunes - 664 sys sys 1128038631 256100
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -12905,7 +12905,7 @@ sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
 sys/src/cmd/ssh/sshserve.c - 664 sys sys 1062091020 5786
 sys/src/cmd/ssh/util.c - 664 sys sys 1063858753 4478
-sys/src/cmd/stats.c - 664 sys sys 1121977164 27868
+sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
 sys/src/cmd/strings.c - 664 sys sys 944961364 1216
 sys/src/cmd/strip.c - 664 sys sys 1108077276 3350
 sys/src/cmd/sum.c - 664 sys sys 1014926615 5548
@@ -14967,3 +14967,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/stats - 775 sys sys 1128049805 190269

dist/replica/plan9.db

@@ -405,7 +405,7 @@
 386/bin/srvold9p - 775 sys sys 1115950114 130193
 386/bin/ssh - 775 sys sys 1127360606 211173
 386/bin/sshnet - 775 sys sys 1127360607 282985
-386/bin/stats - 775 sys sys 1115950115 190072
+386/bin/stats - 775 sys sys 1128049805 190269
 386/bin/strings - 775 sys sys 1125346016 62115
 386/bin/strip - 775 sys sys 1115950116 61981
 386/bin/sum - 775 sys sys 1115950116 39470
@@ -5764,7 +5764,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1127394114 256007
+sys/games/lib/fortunes - 664 sys sys 1128038631 256100
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -12905,7 +12905,7 @@ sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
 sys/src/cmd/ssh/sshserve.c - 664 sys sys 1062091020 5786
 sys/src/cmd/ssh/util.c - 664 sys sys 1063858753 4478
-sys/src/cmd/stats.c - 664 sys sys 1121977164 27868
+sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
 sys/src/cmd/strings.c - 664 sys sys 944961364 1216
 sys/src/cmd/strip.c - 664 sys sys 1108077276 3350
 sys/src/cmd/sum.c - 664 sys sys 1014926615 5548

dist/replica/plan9.log

@@ -21489,3 +21489,6 @@
 1127791835 8 c 386/bin/ip/httpd/webls - 775 sys sys 1127790503 131239
 1127791835 9 c 386/bin/ip/httpd/wikipost - 775 sys sys 1127790503 112677
 1127791835 10 c 386/lib/libhttpd.a - 664 sys sys 1127790504 99596
+1127975474 0 c sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
+1128040289 0 c sys/games/lib/fortunes - 664 sys sys 1128038631 256100
+1128051093 0 c 386/bin/stats - 775 sys sys 1128049805 190269

sys/games/lib/fortunes

@@ -4085,3 +4085,4 @@ A C, an E-flat, and a G walk into a bar.  The bartender says, "Sorry, but we don
 /// The ForTo class avoids confusing syntax of "for (int i=1;i<=4;i++) {...}". This can be replaced with "foreach (int i in new ForTo(1,4)) {...}".
 Linux is for people who hate Windows.  BSD is for people who love UNIX.
 If plan9 was a village then I'd probably be the village idiot, but it would still be better than living in the city.  - Dave Lukes
+Software has gotten too fat and unreliable, so we started with Linux.  - Nicholas Negroponte

sys/src/cmd/stats.c

@@ -27,11 +27,12 @@ struct Graph
 
 enum
 {
-	/* /dev/swap */
+	/* old /dev/swap */
 	Mem		= 0,
 	Maxmem,
 	Swap,
 	Maxswap,
+	
 	/* /dev/sysstats */
 	Procno	= 0,
 	Context,
@@ -284,7 +285,7 @@ loadbuf(Machine *m, int *fd)
 	if(*fd < 0)
 		return 0;
 	seek(*fd, 0, 0);
-	n = read(*fd, m->buf, sizeof m->buf);
+	n = read(*fd, m->buf, sizeof m->buf-1);
 	if(n <= 0){
 		close(*fd);
 		*fd = -1;
@@ -292,6 +293,7 @@ loadbuf(Machine *m, int *fd)
 	}
 	m->bufp = m->buf;
 	m->ebufp = m->buf+n;
+	m->buf[n] = 0;
 	return 1;
 }
 
@@ -576,6 +578,22 @@ connectexportfs(char *addr)
 	return fd;
 }
 
+int
+readswap(Machine *m, ulong *a)
+{
+	if(strstr(m->buf, "memory\n")){
+		/* new /dev/swap - skip first 3 numbers */
+		if(!readnums(m, 7, a, 1))
+			return 0;
+		a[0] = a[3];
+		a[1] = a[4];
+		a[2] = a[5];
+		a[3] = a[6];
+		return 1;
+	}
+	return readnums(m, nelem(m->devswap), a, 0);
+}
+
 int
 initmach(Machine *m, char *name)
 {
@@ -612,7 +630,7 @@ initmach(Machine *m, char *name)
 
 	snprint(buf, sizeof buf, "%s/dev/swap", mpt);
 	m->swapfd = open(buf, OREAD);
-	if(loadbuf(m, &m->swapfd) && readnums(m, nelem(m->devswap), a, 0))
+	if(loadbuf(m, &m->swapfd) && readswap(m, a))
 		memmove(m->devswap, a, sizeof m->devswap);
 	else
 		m->devswap[Maxmem] = m->devswap[Maxswap] = 100;
@@ -722,7 +740,7 @@ readmach(Machine *m, int init)
 		notify(alarmed);
 		alarm(5000);
 	}
-	if(needswap(init) && loadbuf(m, &m->swapfd) && readnums(m, nelem(m->devswap), a, 0))
+	if(needswap(init) && loadbuf(m, &m->swapfd) && readswap(m, a))
 		memmove(m->devswap, a, sizeof m->devswap);
 	if(needstat(init) && loadbuf(m, &m->statsfd)){
 		memmove(m->prevsysstat, m->devsysstat, sizeof m->devsysstat);