Browse Source

Plan 9 from Bell Labs 2007-11-30

David du Colombier 16 years ago
parent
commit
e51449e228

+ 18 - 16
dist/replica/_plan9.db

@@ -7395,6 +7395,7 @@ sys/man/1/eqn - 664 sys sys 1134592617 5655
 sys/man/1/expect - 664 sys sys 1165622338 3018
 sys/man/1/faces - 664 sys sys 1113743326 2395
 sys/man/1/factor - 664 sys sys 1135084026 1015
+sys/man/1/fedex - 664 sys sys 1196368212 399
 sys/man/1/file - 664 sys sys 1157143697 1481
 sys/man/1/filter - 664 sys sys 1159419912 6143
 sys/man/1/fmt - 664 sys sys 1070032221 1557
@@ -7433,6 +7434,7 @@ sys/man/1/mlmgr - 664 sys sys 1116513886 2542
 sys/man/1/mp3dec - 664 sys sys 1196227746 4987
 sys/man/1/mp3enc - 664 sys sys 1196208904 3236
 sys/man/1/ms2html - 664 sys sys 1138458899 1252
+sys/man/1/mtime - 664 sys sys 1196364992 239
 sys/man/1/mug - 664 sys sys 1158800370 1424
 sys/man/1/nedmail - 664 sys sys 1159419884 6821
 sys/man/1/netstat - 664 sys sys 1128255431 942
@@ -8105,7 +8107,7 @@ sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1194796690 45327
-sys/src/9/pc/etherm10g.c - 664 sys sys 1174595240 27681
+sys/src/9/pc/etherm10g.c - 664 sys sys 1196312384 28472
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
 sys/src/9/pc/ethermii.c - 664 sys sys 1181160689 4668
@@ -8143,7 +8145,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1191886075 1566
 sys/src/9/pc/pcf - 664 sys sys 1191885750 1603
 sys/src/9/pc/pcfl - 664 sys sys 1188582378 1579
 sys/src/9/pc/pcflop - 664 sys sys 1190853787 1540
-sys/src/9/pc/pci.c - 664 sys sys 1185452613 29418
+sys/src/9/pc/pci.c - 664 sys sys 1196312222 29483
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1191476436 1591
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1184467714 5324
@@ -8202,14 +8204,14 @@ sys/src/9/port - 20000000775 sys sys 1161222882 0
 sys/src/9/port/alarm.c - 664 sys sys 1134042902 1425
 sys/src/9/port/alloc.c - 664 sys sys 1138459977 5704
 sys/src/9/port/allocb.c - 664 sys sys 1123676437 3340
-sys/src/9/port/aoe.h - 664 sys sys 1187043215 806
+sys/src/9/port/aoe.h - 664 sys sys 1196312063 1000
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
 sys/src/9/port/cache.c - 664 sys sys 1170456667 9285
 sys/src/9/port/chan.c - 664 sys sys 1195585806 34962
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1194913595 42084
+sys/src/9/port/devaoe.c - 664 sys sys 1196312093 42085
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1187735844 24076
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -9213,7 +9215,7 @@ sys/src/boot/pc/pbsdisk.s - 664 sys sys 1017854325 6371
 sys/src/boot/pc/pbsdisklba - 775 sys sys 1015007954 509
 sys/src/boot/pc/pbsdisklba.s - 664 sys sys 1015007954 6022
 sys/src/boot/pc/pbslba.s - 664 sys sys 1186031549 8180
-sys/src/boot/pc/pci.c - 664 sys sys 1176379998 20605
+sys/src/boot/pc/pci.c - 664 sys sys 1196312243 20667
 sys/src/boot/pc/print.c - 664 sys sys 1094674483 219
 sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
@@ -14332,7 +14334,7 @@ sys/src/cmd/venti/root.c - 664 sys sys 1177189435 1329
 sys/src/cmd/venti/srv - 20000000775 sys sys 1189020012 0
 sys/src/cmd/venti/srv/arena.c - 664 sys sys 1191257299 20137
 sys/src/cmd/venti/srv/arenas.c - 664 sys sys 1178160303 8039
-sys/src/cmd/venti/srv/bloom.c - 664 sys sys 1193789584 4514
+sys/src/cmd/venti/srv/bloom.c - 664 sys sys 1196369124 4445
 sys/src/cmd/venti/srv/buildbuck.c - 664 sys sys 1177189435 2837
 sys/src/cmd/venti/srv/buildindex.c - 664 sys sys 1191257306 21645
 sys/src/cmd/venti/srv/checkarenas.c - 664 sys sys 1191257304 2310
@@ -14343,12 +14345,12 @@ sys/src/cmd/venti/srv/cmparenas.c - 664 sys sys 1177189435 7215
 sys/src/cmd/venti/srv/conf.rc - 775 sys sys 1189304120 1416
 sys/src/cmd/venti/srv/config.c - 664 sys sys 1191257289 5659
 sys/src/cmd/venti/srv/conv.c - 664 sys sys 1191257291 14072
-sys/src/cmd/venti/srv/dat.h - 664 sys sys 1191257301 19110
-sys/src/cmd/venti/srv/dcache.c - 664 sys sys 1193791082 15587
+sys/src/cmd/venti/srv/dat.h - 664 sys sys 1196369171 19088
+sys/src/cmd/venti/srv/dcache.c - 664 sys sys 1196369150 15782
 sys/src/cmd/venti/srv/disksched.c - 664 sys sys 1193791117 2127
 sys/src/cmd/venti/srv/dump.c - 664 sys sys 1142736352 1642
 sys/src/cmd/venti/srv/findscore.c - 664 sys sys 1179863768 2195
-sys/src/cmd/venti/srv/fixarenas.c - 664 sys sys 1190076775 40524
+sys/src/cmd/venti/srv/fixarenas.c - 664 sys sys 1196369208 40653
 sys/src/cmd/venti/srv/fmtarenas.c - 664 sys sys 1177189436 2702
 sys/src/cmd/venti/srv/fmtbloom.c - 664 sys sys 1142736352 2293
 sys/src/cmd/venti/srv/fmtindex.c - 664 sys sys 1178160304 2599
@@ -14357,13 +14359,13 @@ sys/src/cmd/venti/srv/fns.h - 664 sys sys 1191430752 9231
 sys/src/cmd/venti/srv/graph.c - 664 sys sys 1177189436 4190
 sys/src/cmd/venti/srv/hdisk.c - 664 sys sys 1191257294 16482
 sys/src/cmd/venti/srv/hproc.c - 664 sys sys 1193855451 10662
-sys/src/cmd/venti/srv/httpd.c - 664 sys sys 1191430753 22897
-sys/src/cmd/venti/srv/icache.c - 664 sys sys 1193791133 10679
-sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1193791073 7532
+sys/src/cmd/venti/srv/httpd.c - 664 sys sys 1196369182 22877
+sys/src/cmd/venti/srv/icache.c - 664 sys sys 1196369136 10617
+sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1196382019 7477
 sys/src/cmd/venti/srv/ifile.c - 664 sys sys 1189307036 2592
 sys/src/cmd/venti/srv/index.c - 664 sys sys 1191257302 17933
 sys/src/cmd/venti/srv/lump.c - 664 sys sys 1191257295 4947
-sys/src/cmd/venti/srv/lumpcache.c - 664 sys sys 1177189437 8811
+sys/src/cmd/venti/srv/lumpcache.c - 664 sys sys 1196369165 8897
 sys/src/cmd/venti/srv/lumpqueue.c - 664 sys sys 1142736354 2722
 sys/src/cmd/venti/srv/mirrorarenas.c - 664 sys sys 1191257291 10802
 sys/src/cmd/venti/srv/mkfile - 664 sys sys 1191430751 1300
@@ -14380,7 +14382,7 @@ sys/src/cmd/venti/srv/reseal.c - 664 sys sys 1177189438 6682
 sys/src/cmd/venti/srv/round.c - 664 sys sys 1142736355 1577
 sys/src/cmd/venti/srv/score.c - 664 sys sys 1178160305 740
 sys/src/cmd/venti/srv/sortientry.c - 664 sys sys 1177189439 8325
-sys/src/cmd/venti/srv/stats.c - 664 sys sys 1191257294 4054
+sys/src/cmd/venti/srv/stats.c - 664 sys sys 1196369156 4020
 sys/src/cmd/venti/srv/stdinc.h - 664 sys sys 1177189439 169
 sys/src/cmd/venti/srv/syncarena.c - 664 sys sys 1191257305 4816
 sys/src/cmd/venti/srv/syncindex.c - 664 sys sys 1191257309 1277
@@ -14389,7 +14391,7 @@ sys/src/cmd/venti/srv/trace.c - 664 sys sys 1142736356 709
 sys/src/cmd/venti/srv/unittoull.c - 664 sys sys 1142736356 471
 sys/src/cmd/venti/srv/unwhack.c - 664 sys sys 1142736356 3191
 sys/src/cmd/venti/srv/utils.c - 664 sys sys 1193791159 3751
-sys/src/cmd/venti/srv/venti.c - 664 sys sys 1191257307 5584
+sys/src/cmd/venti/srv/venti.c - 664 sys sys 1196382019 5604
 sys/src/cmd/venti/srv/verifyarena.c - 664 sys sys 1191257292 5776
 sys/src/cmd/venti/srv/whack.c - 664 sys sys 1142736357 6419
 sys/src/cmd/venti/srv/whack.h - 664 sys sys 1142736357 966
@@ -15827,7 +15829,7 @@ sys/src/libventi/time.c - 664 sys sys 1177189442 497
 sys/src/libventi/version.c - 664 sys sys 1177189442 2174
 sys/src/libventi/zero.c - 664 sys sys 1177189442 899
 sys/src/libventi/zeroscore.c - 664 sys sys 1177189442 248
-sys/src/mkfile - 664 sys sys 1193784248 1026
+sys/src/mkfile - 664 sys sys 1196366544 1026
 sys/src/mkfile.proto - 664 sys sys 1105121349 265
 tmp - 20000000555 sys sys 1020896384 0
 usr - 20000000775 sys sys 953406542 0

+ 18 - 16
dist/replica/plan9.db

@@ -7395,6 +7395,7 @@ sys/man/1/eqn - 664 sys sys 1134592617 5655
 sys/man/1/expect - 664 sys sys 1165622338 3018
 sys/man/1/faces - 664 sys sys 1113743326 2395
 sys/man/1/factor - 664 sys sys 1135084026 1015
+sys/man/1/fedex - 664 sys sys 1196368212 399
 sys/man/1/file - 664 sys sys 1157143697 1481
 sys/man/1/filter - 664 sys sys 1159419912 6143
 sys/man/1/fmt - 664 sys sys 1070032221 1557
@@ -7433,6 +7434,7 @@ sys/man/1/mlmgr - 664 sys sys 1116513886 2542
 sys/man/1/mp3dec - 664 sys sys 1196227746 4987
 sys/man/1/mp3enc - 664 sys sys 1196208904 3236
 sys/man/1/ms2html - 664 sys sys 1138458899 1252
+sys/man/1/mtime - 664 sys sys 1196364992 239
 sys/man/1/mug - 664 sys sys 1158800370 1424
 sys/man/1/nedmail - 664 sys sys 1159419884 6821
 sys/man/1/netstat - 664 sys sys 1128255431 942
@@ -8105,7 +8107,7 @@ sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1194796690 45327
-sys/src/9/pc/etherm10g.c - 664 sys sys 1174595240 27681
+sys/src/9/pc/etherm10g.c - 664 sys sys 1196312384 28472
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
 sys/src/9/pc/ethermii.c - 664 sys sys 1181160689 4668
@@ -8143,7 +8145,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1191886075 1566
 sys/src/9/pc/pcf - 664 sys sys 1191885750 1603
 sys/src/9/pc/pcfl - 664 sys sys 1188582378 1579
 sys/src/9/pc/pcflop - 664 sys sys 1190853787 1540
-sys/src/9/pc/pci.c - 664 sys sys 1185452613 29418
+sys/src/9/pc/pci.c - 664 sys sys 1196312222 29483
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1191476436 1591
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1184467714 5324
@@ -8202,14 +8204,14 @@ sys/src/9/port - 20000000775 sys sys 1161222882 0
 sys/src/9/port/alarm.c - 664 sys sys 1134042902 1425
 sys/src/9/port/alloc.c - 664 sys sys 1138459977 5704
 sys/src/9/port/allocb.c - 664 sys sys 1123676437 3340
-sys/src/9/port/aoe.h - 664 sys sys 1187043215 806
+sys/src/9/port/aoe.h - 664 sys sys 1196312063 1000
 sys/src/9/port/auth.c - 664 sys sys 1123647282 2392
 sys/src/9/port/cache.c - 664 sys sys 1170456667 9285
 sys/src/9/port/chan.c - 664 sys sys 1195585806 34962
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1194913595 42084
+sys/src/9/port/devaoe.c - 664 sys sys 1196312093 42085
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1187735844 24076
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -9213,7 +9215,7 @@ sys/src/boot/pc/pbsdisk.s - 664 sys sys 1017854325 6371
 sys/src/boot/pc/pbsdisklba - 775 sys sys 1015007954 509
 sys/src/boot/pc/pbsdisklba.s - 664 sys sys 1015007954 6022
 sys/src/boot/pc/pbslba.s - 664 sys sys 1186031549 8180
-sys/src/boot/pc/pci.c - 664 sys sys 1176379998 20605
+sys/src/boot/pc/pci.c - 664 sys sys 1196312243 20667
 sys/src/boot/pc/print.c - 664 sys sys 1094674483 219
 sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
@@ -14332,7 +14334,7 @@ sys/src/cmd/venti/root.c - 664 sys sys 1177189435 1329
 sys/src/cmd/venti/srv - 20000000775 sys sys 1189020012 0
 sys/src/cmd/venti/srv/arena.c - 664 sys sys 1191257299 20137
 sys/src/cmd/venti/srv/arenas.c - 664 sys sys 1178160303 8039
-sys/src/cmd/venti/srv/bloom.c - 664 sys sys 1193789584 4514
+sys/src/cmd/venti/srv/bloom.c - 664 sys sys 1196369124 4445
 sys/src/cmd/venti/srv/buildbuck.c - 664 sys sys 1177189435 2837
 sys/src/cmd/venti/srv/buildindex.c - 664 sys sys 1191257306 21645
 sys/src/cmd/venti/srv/checkarenas.c - 664 sys sys 1191257304 2310
@@ -14343,12 +14345,12 @@ sys/src/cmd/venti/srv/cmparenas.c - 664 sys sys 1177189435 7215
 sys/src/cmd/venti/srv/conf.rc - 775 sys sys 1189304120 1416
 sys/src/cmd/venti/srv/config.c - 664 sys sys 1191257289 5659
 sys/src/cmd/venti/srv/conv.c - 664 sys sys 1191257291 14072
-sys/src/cmd/venti/srv/dat.h - 664 sys sys 1191257301 19110
-sys/src/cmd/venti/srv/dcache.c - 664 sys sys 1193791082 15587
+sys/src/cmd/venti/srv/dat.h - 664 sys sys 1196369171 19088
+sys/src/cmd/venti/srv/dcache.c - 664 sys sys 1196369150 15782
 sys/src/cmd/venti/srv/disksched.c - 664 sys sys 1193791117 2127
 sys/src/cmd/venti/srv/dump.c - 664 sys sys 1142736352 1642
 sys/src/cmd/venti/srv/findscore.c - 664 sys sys 1179863768 2195
-sys/src/cmd/venti/srv/fixarenas.c - 664 sys sys 1190076775 40524
+sys/src/cmd/venti/srv/fixarenas.c - 664 sys sys 1196369208 40653
 sys/src/cmd/venti/srv/fmtarenas.c - 664 sys sys 1177189436 2702
 sys/src/cmd/venti/srv/fmtbloom.c - 664 sys sys 1142736352 2293
 sys/src/cmd/venti/srv/fmtindex.c - 664 sys sys 1178160304 2599
@@ -14357,13 +14359,13 @@ sys/src/cmd/venti/srv/fns.h - 664 sys sys 1191430752 9231
 sys/src/cmd/venti/srv/graph.c - 664 sys sys 1177189436 4190
 sys/src/cmd/venti/srv/hdisk.c - 664 sys sys 1191257294 16482
 sys/src/cmd/venti/srv/hproc.c - 664 sys sys 1193855451 10662
-sys/src/cmd/venti/srv/httpd.c - 664 sys sys 1191430753 22897
-sys/src/cmd/venti/srv/icache.c - 664 sys sys 1193791133 10679
-sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1193791073 7532
+sys/src/cmd/venti/srv/httpd.c - 664 sys sys 1196369182 22877
+sys/src/cmd/venti/srv/icache.c - 664 sys sys 1196369136 10617
+sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1196382019 7477
 sys/src/cmd/venti/srv/ifile.c - 664 sys sys 1189307036 2592
 sys/src/cmd/venti/srv/index.c - 664 sys sys 1191257302 17933
 sys/src/cmd/venti/srv/lump.c - 664 sys sys 1191257295 4947
-sys/src/cmd/venti/srv/lumpcache.c - 664 sys sys 1177189437 8811
+sys/src/cmd/venti/srv/lumpcache.c - 664 sys sys 1196369165 8897
 sys/src/cmd/venti/srv/lumpqueue.c - 664 sys sys 1142736354 2722
 sys/src/cmd/venti/srv/mirrorarenas.c - 664 sys sys 1191257291 10802
 sys/src/cmd/venti/srv/mkfile - 664 sys sys 1191430751 1300
@@ -14380,7 +14382,7 @@ sys/src/cmd/venti/srv/reseal.c - 664 sys sys 1177189438 6682
 sys/src/cmd/venti/srv/round.c - 664 sys sys 1142736355 1577
 sys/src/cmd/venti/srv/score.c - 664 sys sys 1178160305 740
 sys/src/cmd/venti/srv/sortientry.c - 664 sys sys 1177189439 8325
-sys/src/cmd/venti/srv/stats.c - 664 sys sys 1191257294 4054
+sys/src/cmd/venti/srv/stats.c - 664 sys sys 1196369156 4020
 sys/src/cmd/venti/srv/stdinc.h - 664 sys sys 1177189439 169
 sys/src/cmd/venti/srv/syncarena.c - 664 sys sys 1191257305 4816
 sys/src/cmd/venti/srv/syncindex.c - 664 sys sys 1191257309 1277
@@ -14389,7 +14391,7 @@ sys/src/cmd/venti/srv/trace.c - 664 sys sys 1142736356 709
 sys/src/cmd/venti/srv/unittoull.c - 664 sys sys 1142736356 471
 sys/src/cmd/venti/srv/unwhack.c - 664 sys sys 1142736356 3191
 sys/src/cmd/venti/srv/utils.c - 664 sys sys 1193791159 3751
-sys/src/cmd/venti/srv/venti.c - 664 sys sys 1191257307 5584
+sys/src/cmd/venti/srv/venti.c - 664 sys sys 1196382019 5604
 sys/src/cmd/venti/srv/verifyarena.c - 664 sys sys 1191257292 5776
 sys/src/cmd/venti/srv/whack.c - 664 sys sys 1142736357 6419
 sys/src/cmd/venti/srv/whack.h - 664 sys sys 1142736357 966
@@ -15827,7 +15829,7 @@ sys/src/libventi/time.c - 664 sys sys 1177189442 497
 sys/src/libventi/version.c - 664 sys sys 1177189442 2174
 sys/src/libventi/zero.c - 664 sys sys 1177189442 899
 sys/src/libventi/zeroscore.c - 664 sys sys 1177189442 248
-sys/src/mkfile - 664 sys sys 1193784248 1026
+sys/src/mkfile - 664 sys sys 1196366544 1026
 sys/src/mkfile.proto - 664 sys sys 1105121349 265
 tmp - 20000000555 sys sys 1020896384 0
 usr - 20000000775 sys sys 953406542 0

+ 21 - 0
dist/replica/plan9.log

@@ -17498,3 +17498,24 @@
 1196265604 0 c lib/face/48x48x8/.dict - 664 sys sys 1196265401 4295
 1196265604 1 c sys/src/9/pc/archmp.c - 664 sys sys 1196264189 2410
 1196274605 0 c sys/src/cmd/replica/updatedb.c - 664 sys sys 1196273470 3837
+1196312404 0 c sys/src/9/pc/pci.c - 664 sys sys 1196312222 29483
+1196312404 1 c sys/src/9/pc/etherm10g.c - 664 sys sys 1196312384 28472
+1196312404 2 c sys/src/9/port/aoe.h - 664 sys sys 1196312063 1000
+1196312404 3 c sys/src/9/port/devaoe.c - 664 sys sys 1196312093 42085
+1196312404 4 c sys/src/boot/pc/pci.c - 664 sys sys 1196312243 20667
+1196364604 0 a sys/man/1/mtime - 664 sys sys 1196364463 237
+1196366405 0 c sys/man/1/mtime - 664 sys sys 1196364992 239
+1196366405 1 c sys/src/mkfile - 664 sys sys 1196366544 1026
+1196368204 0 a sys/man/1/fedex - 664 sys sys 1196368212 399
+1196370004 0 c sys/src/cmd/venti/srv/bloom.c - 664 sys sys 1196369124 4445
+1196370004 1 c sys/src/cmd/venti/srv/dat.h - 664 sys sys 1196369171 19088
+1196370004 2 c sys/src/cmd/venti/srv/dcache.c - 664 sys sys 1196369150 15782
+1196370004 3 c sys/src/cmd/venti/srv/fixarenas.c - 664 sys sys 1196369208 40653
+1196370004 4 c sys/src/cmd/venti/srv/httpd.c - 664 sys sys 1196369182 22877
+1196370004 5 c sys/src/cmd/venti/srv/icache.c - 664 sys sys 1196369136 10617
+1196370004 6 c sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1196369110 7542
+1196370004 7 c sys/src/cmd/venti/srv/lumpcache.c - 664 sys sys 1196369165 8897
+1196370004 8 c sys/src/cmd/venti/srv/stats.c - 664 sys sys 1196369156 4020
+1196370004 9 c sys/src/cmd/venti/srv/venti.c - 664 sys sys 1196369098 5595
+1196382604 0 c sys/src/cmd/venti/srv/icachewrite.c - 664 sys sys 1196382019 7477
+1196382604 1 c sys/src/cmd/venti/srv/venti.c - 664 sys sys 1196382019 5604

+ 21 - 0
sys/man/1/fedex

@@ -0,0 +1,21 @@
+.TH FEDEX 1
+.SH NAME
+fedex, ups \- track shipments
+.SH SYNOPSIS
+.B fedex 
+.I tracking-number
+.br
+.B ups 
+.I tracking-number
+.SH DESCRIPTION
+.I Fedex
+writes available shipment details for the given 12-digit
+.I tracking-number
+on the standard output.
+.I Ups
+is similar, but takes 18-digit
+.IR tracking-number s.
+.SH SOURCE
+.B /rc/bin
+.SH BUGS
+Redesigns of the source website can break these programs.

+ 13 - 0
sys/man/1/mtime

@@ -0,0 +1,13 @@
+.TH MTIME 1
+.SH NAME
+mtime \- print file modification time
+.SH SYNOPSIS
+.B mtime
+.I file ...
+.SH DESCRIPTION
+.I Mtime
+prints the modification time (in seconds since the epoch) and name
+of each
+.IR file .
+.SH SOURCE
+.B /sys/src/cmd/mtime.c

+ 1 - 4
sys/src/cmd/venti/srv/bloom.c

@@ -198,7 +198,6 @@ int
 inbloomfilter(Bloom *b, u8int *score)
 {
 	int r;
-	uint ms;
 
 	if(b == nil || b->data == nil)
 		return 1;
@@ -206,12 +205,10 @@ inbloomfilter(Bloom *b, u8int *score)
 	if(ignorebloom)
 		return 1;
 	
-	ms = msec();
 	rlock(&b->lk);
 	r = _inbloomfilter(b, score);
 	runlock(&b->lk);
-	ms = ms - msec();
-	addstat2(StatBloomLookup, 1, StatBloomLookupTime, ms);
+	addstat(StatBloomLookup, 1);
 	if(r)
 		addstat(StatBloomMiss, 1);
 	else

+ 0 - 1
sys/src/cmd/venti/srv/dat.h

@@ -637,7 +637,6 @@ enum
 	StatBloomLookup,
 	StatBloomOnes,
 	StatBloomBits,
-	StatBloomLookupTime,
 
 	StatApartRead,
 	StatApartReadBytes,

+ 13 - 7
sys/src/cmd/venti/srv/dcache.c

@@ -134,16 +134,12 @@ DBlock*
 getdblock(Part *part, u64int addr, int mode)
 {
 	DBlock *b;
-	uint ms;
 	
-	ms = msec();
 	b = _getdblock(part, addr, mode, 1);
 	if(mode == OREAD || mode == ORDWR)
 		addstat(StatDcacheRead, 1);
 	if(mode == OWRITE || mode == ORDWR)
 		addstat(StatDcacheWrite, 1);
-	ms = msec() - ms;
-	addstat2(StatDcacheLookup, 1, StatDcacheLookupTime, ms);
 	return b;
 }
 
@@ -151,12 +147,15 @@ DBlock*
 _getdblock(Part *part, u64int addr, int mode, int load)
 {
 	DBlock *b;
-	u32int h, size;
+	u32int h, size, ms;
 
+	ms = 0;
 	trace(TraceBlock, "getdblock enter %s 0x%llux", part->name, addr);
 	size = part->blocksize;
 	if(size > dcache.size){
 		seterr(EAdmin, "block size %d too big for cache with size %d", size, dcache.size);
+		if(load)
+			addstat(StatDcacheLookup, 1);
 		return nil;
 	}
 	h = pbhash(addr);
@@ -169,7 +168,7 @@ again:
 	for(b = dcache.heads[h]; b != nil; b = b->next){
 		if(b->part == part && b->addr == addr){
 			if(load)
-				addstat(StatDcacheHit, 1);
+				addstat2(StatDcacheHit, 1, StatDcacheLookup, 1);
 			goto found;
 		}
 	}
@@ -183,7 +182,12 @@ again:
 		return nil;
 	}
 
-	addstat(StatDcacheMiss, 1);
+	/*
+	 * Only start timer here, on cache miss - calling msec() on plain cache hits
+	 * makes cache hits system-call bound.
+	 */
+	ms = msec();
+	addstat2(StatDcacheLookup, 1, StatDcacheMiss, 1);
 
 	b = bumpdblock();
 	if(b == nil){
@@ -272,6 +276,8 @@ found:
 
 	b->mode = mode;
 	trace(TraceBlock, "getdblock exit");
+	if(ms)
+		addstat(StatDcacheLookupTime, msec() - ms);
 	return b;
 }
 

+ 4 - 3
sys/src/cmd/venti/srv/fixarenas.c

@@ -661,7 +661,7 @@ isonearena(void)
 	return u32(pagein(0, Block)) == ArenaHeadMagic;
 }
 
-static int tabsizes[] = { 16*1024, 64*1024, 512*1024, };
+static int tabsizes[] = { 16*1024, 64*1024, 512*1024, 768*1024, };
 /*
  * Poke around on the disk to guess what the ArenaPart numbers are.
  */
@@ -807,8 +807,9 @@ guessgeometry(void)
 	 * Fmtarenas used to use 64k tab, now uses 512k tab.
 	 */
 	if(ap.arenabase == 0){
+		print("trying standard arena bases...\n");
 		for(i=0; i<nelem(tabsizes); i++){
-			ap.arenabase = ROUNDUP(PartBlank+HeadSize, ap.blocksize);
+			ap.arenabase = ROUNDUP(PartBlank+HeadSize+tabsizes[i], ap.blocksize);
 			p = pagein(ap.arenabase, Block);
 			if(u32(p) == ArenaHeadMagic)
 				break;
@@ -1554,7 +1555,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena,
 	bcit = cibuf;
 	ecit = cibuf+ncibuf;
 	
-	smart = 1;
+	smart = 0;	/* Somehow the smart code doesn't do corrupt clumps right. */
 Again:
 	nbad = 0;
 	ci = bci;

+ 0 - 1
sys/src/cmd/venti/srv/httpd.c

@@ -915,7 +915,6 @@ static char* graphname[] =
 	"bloomlookup",
 	"bloomones",
 	"bloombits",
-	"bloomlookuptime",
 
 	"apartread",
 	"apartreadbyte",

+ 16 - 19
sys/src/cmd/venti/srv/icache.c

@@ -250,6 +250,8 @@ scachemiss(u64int addr)
 {
 	ISum *s;
 
+	if(!icacheprefetch)
+		return nil;
 	s = scachelookup(addr);
 	if(s == nil){
 		/* first time: make an entry in the cache but don't populate it yet */
@@ -440,32 +442,27 @@ insertscore(u8int score[VtScoreSize], IAddr *ia, int state, AState *as)
 	return 0;
 }
 
-static int
-lookupscore_untimed(u8int score[VtScoreSize], int type, IAddr *ia)
+int
+lookupscore(u8int score[VtScoreSize], int type, IAddr *ia)
 {
+	int ms, ret;
 	IEntry d;
 
-	if(icachelookup(score, type, ia) >= 0)
+	if(icachelookup(score, type, ia) >= 0){
+		addstat(StatIcacheRead, 1);
 		return 0;
+	}
 
+	ms = msec();
 	addstat(StatIcacheFill, 1);
 	if(loadientry(mainindex, score, type, &d) < 0)
-		return -1;
-	
-	insertscore(score, &d.ia, IEClean, nil);
-	*ia = d.ia;
-	return 0;
-}
-
-int
-lookupscore(u8int score[VtScoreSize], int type, IAddr *ia)
-{
-	int ms, ret;
-	
-	ms = msec();
-	ret = lookupscore_untimed(score, type, ia);
-	ms = msec() - ms;
-	addstat2(StatIcacheRead, 1, StatIcacheReadTime, ms);
+		ret = -1;
+	else{
+		ret = 0;
+		insertscore(score, &d.ia, IEClean, nil);
+		*ia = d.ia;
+	}
+	addstat2(StatIcacheRead, 1, StatIcacheReadTime, msec() - ms);
 	return ret;
 }
 	

+ 0 - 1
sys/src/cmd/venti/srv/icachewrite.c

@@ -251,7 +251,6 @@ icachewritecoord(void *v)
 		as = icachestate();
 		if(as.arena==iwrite.as.arena && as.aa==iwrite.as.aa){
 			/* will not be able to do anything more than last flush - kick disk */
-			fprint(2, "icache: nothing to do - kick dcache\n");
 			trace(TraceProc, "icachewritecoord kick dcache");
 			kickdcache();
 			trace(TraceProc, "icachewritecoord kicked dcache");

+ 5 - 2
sys/src/cmd/venti/srv/lumpcache.c

@@ -71,7 +71,7 @@ lookuplump(u8int *score, int type)
 	Lump *b;
 	u32int h;
 
-	ms = msec();
+	ms = 0;
 	trace(TraceLump, "lookuplump enter");
 	
 	h = hashbits(score, HashLog);
@@ -112,6 +112,9 @@ again:
 		CHECK(checklumpcache());
 	}
 
+	/* start timer on cache miss to avoid system call on cache hit */
+	ms = msec();
+
 	addstat(StatLcacheMiss, 1);
 	b = lumpcache.free;
 	lumpcache.free = b->next;
@@ -151,7 +154,7 @@ found:
 	addstat(StatLumpStall, -1);
 
 	trace(TraceLump, "lookuplump exit");
-	addstat2(StatLcacheRead, 1, StatLcacheReadTime, msec()-ms);
+	addstat2(StatLcacheRead, 1, StatLcacheReadTime, ms ? msec()-ms : 0);
 	return b;
 }
 

+ 0 - 1
sys/src/cmd/venti/srv/stats.c

@@ -70,7 +70,6 @@ Statdesc statdesc[NStat] =
 	{ "bloom filter lookups", },
 	{ "bloom filter ones", },
 	{ "bloom filter bits", },
-	{ "bloom filter lookup time", },
 
 	{ "arena block reads", },
 	{ "arena block read bytes", },

+ 2 - 0
sys/src/cmd/venti/srv/venti.c

@@ -186,6 +186,8 @@ threadmain(int argc, char *argv[])
 		ventiserver(nil);
 	else
 		vtproc(ventiserver, nil);
+
+	threadexits(nil);
 }
 
 static void