# HG changeset patch # User Francisco J Ballesteros # Date 1316018777 -7200 # Node ID 74ae106c3ac573dc9e0f4a01903cc9d693760405 # Parent 2ca754dc5aff70289aa19125ad0603066e1e3a8c More cleanup. test.old is gone. so are pm/clean and pm/depclean R=nix-dev CC=nix-dev http://codereview.appspot.com/5002046 diff -r 2ca754dc5aff -r 74ae106c3ac5 rc/bin/pm/clean --- a/rc/bin/pm/clean Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -#!/bin/rc - -rfork en - -if (~ $#PKGROOT 0) { - PKGROOT=/ -} - -if (~ $#ROOT 0) { - ROOT=/ -} - -if (~ $#PKGSERVER 0) { - PKGSERVER=jfloren.net -} - -if (~ $#* 0) { - echo Need at least one argument - exit 'invalid arg' -} - -for (PKGNAME in $*) { - @{ - # Go to the directory if it exists - if (! test -e $PKGROOT^/contrib/packages/^$PKGNAME) { - echo $PKGNAME^: No such package found in $PKGROOT^/contrib/packages/^$PKGNAME - exit 'no such package' - } - cd $PKGROOT^/contrib/packages/^$PKGNAME - - echo '###Cleaning for package '^$PKGNAME^'###' - # we're leaving this for now - #rm -r root.tgz - if (test -e root) { - rm -r root - } - if not { - echo $PKGNAME is already cleaned - } - } -} diff -r 2ca754dc5aff -r 74ae106c3ac5 rc/bin/pm/depclean --- a/rc/bin/pm/depclean Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -#!/bin/rc - -rfork en - -if (~ $#PKGROOT 0) { - PKGROOT=/ -} - -if (~ $#ROOT 0) { - ROOT=/ -} - -if (~ $#PKGSERVER 0) { - PKGSERVER=jfloren.net -} - -if (~ $#* 0) { - echo Need at least one argument - exit 'invalid arg' -} - -for (PKGNAME in $*) { - @{ - # Go to the directory if it exists - if (! test -e $PKGROOT^/contrib/packages/^$PKGNAME) { - echo $PKGNAME^: No such package found in $PKGROOT^/contrib/packages/^$PKGNAME - exit 'no such package' - } - cd $PKGROOT^/contrib/packages/^$PKGNAME - - pm/clean $PKGNAME - - echo $PKGNAME^: Cleaning for dependencies - for (i in `{cat dep}) { - pm/depclean $i - } - } -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.ainf Binary file sys/src/nix/test.old/6.ainf has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.asys Binary file sys/src/nix/test.old/6.asys has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.ntube Binary file sys/src/nix/test.old/6.ntube has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.seg Binary file sys/src/nix/test.old/6.seg has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.segv Binary file sys/src/nix/test.old/6.segv has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.testexecap Binary file sys/src/nix/test.old/6.testexecap has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.testrfork3 Binary file sys/src/nix/test.old/6.testrfork3 has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.usem Binary file sys/src/nix/test.old/6.usem has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.utube Binary file sys/src/nix/test.old/6.utube has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/6.x Binary file sys/src/nix/test.old/6.x has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/Run --- a/sys/src/nix/test.old/Run Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#!/bin/rc - -tests=(6.ainf 6.ainf) - -cd ../test -cn=1 -for(f in $tests){ - echo $f - 6.test* -c $cn $f - echo $f done - cn=`{echo $cn + 1 |hoc} -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/T --- a/sys/src/nix/test.old/T Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -#!/bin/rc -6.test* -c 1 6.ainf & -echo did it crash'?' diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/T2 --- a/sys/src/nix/test.old/T2 Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -#!/bin/rc -6.test* -c 2 6.ainf & -echo did it crash'?' diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/ainf.s --- a/sys/src/nix/test.old/ainf.s Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - -MODE $64 - -/* - * Port I/O. - */ -TEXT _main(SB), 1, $-4 -a: JMP a - MOVQ $8, RARG - SYSCALL - MOVL $0, RARG -//CALL ,exits+0(SB) - RET , - RET - -/* 6a ainf.s ; 6l -o 6.ainf ainf.6*/ diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/asys.s --- a/sys/src/nix/test.old/asys.s Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -MODE $64 - -TEXT _bite(SB), 1, $0 - MOVQ RARG, a0+0(FP) - MOVQ $8, RARG - SYSCALL - RET - - -/* - * Port I/O. - */ -TEXT _main(SB), 1, $-4 - MOVQ $0, RARG - PUSHQ RARG - CALL _bite(SB) - -/* 6a asys.s ; 6l -o 6.asys asys.6*/ diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/awrite.s --- a/sys/src/nix/test.old/awrite.s Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -MODE $64 - - DATA .string<>+0(SB)/8,$"testing\n" -TEXT _bite(SB), 1, $32 - MOVL $1,BP - MOVQ $.string<>+0(SB),AX - MOVQ AX,8(SP) - MOVL $8,AX - MOVL AX,16(SP) - MOVQ $20, RARG - SYSCALL - MOVQ RARG, a0+0(FP) - MOVQ $8, RARG - SYSCALL - RET , - -/* - * Port I/O. - */ -TEXT _main(SB), 1, $-4 - MOVQ $0, RARG - PUSHQ RARG - CALL _bite(SB) - -/* 6a asys.s ; 6l -o 6.asys asys.6*/ diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/6.rd Binary file sys/src/nix/test.old/mc/6.rd has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/6.seg Binary file sys/src/nix/test.old/mc/6.seg has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/6.wr Binary file sys/src/nix/test.old/mc/6.wr has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/8.out Binary file sys/src/nix/test.old/mc/8.out has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/8.rd Binary file sys/src/nix/test.old/mc/8.rd has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/8.seg Binary file sys/src/nix/test.old/mc/8.seg has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/8.wr Binary file sys/src/nix/test.old/mc/8.wr has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/Try --- a/sys/src/nix/test.old/mc/Try Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -#!/bin/rc -rfork e -path=(/usr/forsyth/bin/amd64 $path) -fn e{ - $* || exit $status -} -e bind -c '#g' /mnt/segment -n=birtwhistle -base=0x10000000 -length=65536 -e mkdir /mnt/segment/$n -e echo va $base $length >/mnt/segment/$n/ctl -cat /mnt/segment/$n/ctl -wr birtwhistle 'hola!' -rd birtwhistle 20 | xd -c -wr birtwhistle 'hola! ¿qué tal?' -rd birtwhistle 20 | xd -c diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/mkfile --- a/sys/src/nix/test.old/mc/mkfile Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - -#include - -/* - * read from a segment via segattach - * (otherwise you can just use xd to see /mnt/segment//data) - */ -void -main(int argc, char **argv) -{ - char *ep; - usize offset, length; - void *va, *buf; - - ARGBEGIN{ - }ARGEND - if(argc < 2) - sysfatal("usage: rd name length [offset]"); - - if(sizeof(length) < sizeof(vlong)) - length = strtoul(argv[1], &ep, 0); - else - length = strtoull(argv[1], &ep, 0); - if(*ep) - sysfatal("non-numeric length: %s", argv[1]); - if(argc > 2){ - if(sizeof(offset) < sizeof(vlong)) - offset = strtoul(argv[2], &ep, 0); - else - offset = strtoull(argv[2], &ep, 0); - if(*ep) - sysfatal("non-numeric offset: %s", argv[2]); - }else - offset = 0; - - va = segattach(0, argv[0], nil, 0); - if(va == (void*)~(uintptr)0) - sysfatal("can't segattach %s: %r", argv[0]); - buf = malloc(length); - if(buf == nil) - sysfatal("can't allocate buffer of %lld bytes: %r", (uvlong)length); - memmove(buf, (char*)va+offset, length); - write(1, buf, length); - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/seg.c --- a/sys/src/nix/test.old/mc/seg.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -#include -#include - -/* - * make a segment - */ -void -main(int argc, char **argv) -{ - int fd, cfd, dfd; - char name[128], ctlname[128]; - char *ep; - uintptr va; - usize length; - - ARGBEGIN{ - }ARGEND - if(argc < 3) - sysfatal("usage: seg name va len [initdata]"); - if(sizeof(va) < sizeof(vlong)) - va = strtoul(argv[1], &ep, 0); - else - va = strtoull(argv[1], &ep, 0); - if(*ep) - sysfatal("non-numeric address: %s", argv[1]); - if(va & (va-1)) - sysfatal("implausible virtual address: %s", argv[1]); - - if(sizeof(length) < sizeof(vlong)) - length = strtoul(argv[2], &ep, 0); - else - length = strtoull(argv[2], &ep, 0); - if(*ep) - sysfatal("non-numeric length: %s", argv[2]); - if(length & (length-1)) - sysfatal("implausible length: %s", argv[2]); - - snprint(name, sizeof(name), "/mnt/segment/%s", argv[0]); - fd = create(name, ORDWR, DMDIR|0777); - if(fd < 0) - sysfatal("can't create %s: %r\n", name); - snprint(ctlname, sizeof(ctlname), "%s/ctl", name); - cfd = open(ctlname, OWRITE); - if(cfd < 0) - sysfatal("can't open %s: %r\n", ctlname); - if(fprint(cfd, "va %#llux %#llux\n", (uvlong)va, (uvlong)length) < 0) - sysfatal("can't set segment va/length: %r"); - if(argc > 3){ - snprint(ctlname, sizeof(ctlname), "%s/data", name); - dfd = open(ctlname, OWRITE); - if(dfd < 0) - sysfatal("can't write initial data to %s: %r", name); - if(write(dfd, argv[3], strlen(argv[3])) < 0) - sysfatal("error writing initial data: %r"); - close(dfd); - } - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/wr Binary file sys/src/nix/test.old/mc/wr has changed diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/mc/wr.c --- a/sys/src/nix/test.old/mc/wr.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -#include -#include - -/* - * write to a segment via segattach - * (otherwise you can just use echo to /mnt/segment//data) - */ -void -main(int argc, char **argv) -{ - char *ep; - usize offset; - void *va; - - ARGBEGIN{ - }ARGEND - if(argc < 2) - sysfatal("usage: wr name data [offset]"); - - if(argc > 2){ - if(sizeof(offset) < sizeof(vlong)) - offset = strtoul(argv[1], &ep, 0); - else - offset = strtoull(argv[1], &ep, 0); - if(*ep) - sysfatal("non-numeric offset: %s", argv[1]); - }else - offset = 0; - va = segattach(0, argv[0], nil, 0); - if(va == (void*)~(uintptr)0) - sysfatal("can't segattach %s: %r", argv[0]); - memmove((char*)va+offset, argv[1], strlen(argv[1])); /* goes bang if offset is silly */ - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/nc.c --- a/sys/src/nix/test.old/nc.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - !6c -FVTw nc.c && 6l -o 6.nc nc.6 - */ - - -#include -#include - -static int dosyscall; -extern int sysr1(void); - -void -thr(int , void *[]) -{ - int i, n; - - for(i = 0; i < 500; i++){ - if(dosyscall) - n = sysr1(); - else - n = tsyscall(gettid(), gettid()); - USED(n); - if(0)print("t%d: rc %d\n", gettid(), n); - } -} - -void -thrmain(int argc, void *argv[]) -{ - int i, id; - - for(i = 0; i < 50; i++){ - if(0)print("t%d: arg[%d] = %s\n", gettid(), i, argv[i]); - id = newthr("thr", thr, argc, argv); - USED(id); - if(0)print("t%d: newthr %d\n", gettid(), id); - } -} - -void -main(int argc, char *argv[]) -{ - ARGBEGIN{ - case 's': - dosyscall = 1; - break; - case 'n': - dosyscall = 0; - break; - }ARGEND; - - nixsyscall(); - newthr("thrmain", thrmain, argc, argv); - sysfatal("newthr returns"); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/notebug --- a/sys/src/nix/test.old/notebug Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -Delete -intrac: ipi to cpu1 -actrap: cpu1: IPI -runacore: trap - - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/ntube.c --- a/sys/src/nix/test.old/ntube.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -#include -#include -#include - -/* - * NIX named tubes testing. - ! 6c -FTVw ntube.c && 6l -o 6.ntube ntube.6 - */ - -void -usage(void) -{ - fprint(2, "usage: %s\n", argv0); - exits("usage"); -} - -void -main(int argc, char *argv[]) -{ - Tube *t; - char *name; - -namedtubedebug = 1; - - name = argv[0]; - ARGBEGIN{ - default: - usage(); - }ARGEND; - if(argc == 1) - name = argv[0]; - else if(argc != 0) - usage(); - - name = smprint("%s!test", name); - t = namedtube(name, sizeof(ulong), 16, 1); - if(t == nil) - sysfatal("namedtube: %r"); - print("%s = %#p\n", name, t); - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/seg.c --- a/sys/src/nix/test.old/seg.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - !6c seg.c && 6l -o 6.seg seg.6 - */ - -#include -#include -#include - -void -main(int argc, char*argv[]) -{ - - void *p; - uvlong va; - ulong len; - char *ep; - - argv0 = argv[0]; - if(argc != 4){ - fprint(2, "usage: %s name va len\n", argv0); - exits("usage"); - } - va = strtoull(argv[2], &ep, 0); - if(*ep) - sysfatal("non numeric va"); - len = strtoul(argv[3], &ep, 0); - if(*ep) - sysfatal("non numeric len"); - p = newseg(argv[1], va, len); - if(p == nil) - sysfatal("newseg: %r"); - print("%s: va %#p\n", argv[1], p); - exits(nil); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/segv.s --- a/sys/src/nix/test.old/segv.s Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - -MODE $64 - -/* - * Port I/O. - */ -TEXT _main(SB), 1, $-4 - MOVQ 0xcafebabedeadbeef, RARG - SYSCALL - MOVL $0, RARG -//CALL ,exits+0(SB) - RET , - RET - -/* 6a segv.s ; 6l -o 6.segv segv.6*/ diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/testexecap.c --- a/sys/src/nix/test.old/testexecap.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -#include -#include - -void -usage(void) -{ - fprint(2, "Usage: testexecap [-c core (default 0)] path [args]\n"); -} - -void -main(int argc, char *argv[]) -{ - int core = 0; - - ARGBEGIN { - case 'c': - core = atoi(EARGF(usage())); - break; - default: - print(" badflag('%c')", ARGC()); - } - ARGEND - - if (argc < 1) - usage(); - - execac(core, argv[0], &argv[0]); - print("Returned? %r\n"); -} - -/* rm -f testexecap.6 ; 6c testexecap.c ; 6l -o 6.testexecap testexecap.6 */ - - - - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/testrfork.c --- a/sys/src/nix/test.old/testrfork.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -#include -#include - -/* - rm -f testrfork.6 - bind /sys/src/9kron/include/libc.h /sys/include/libc.h - bind -c /sys/src/9kron/libc /sys/src/libc - 6c testrfork.c - 6l -o 6.testrfork testrfork.6 -*/ - -void -usage(void) -{ - fprint(2, "Usage: testbuf.c\n"); - exits("usage"); -} - -void -main(int argc, char *argv[]) -{ - int i; - int rounds = 2; - int core; - int type; - - ARGBEGIN { - default: - usage(); - } - ARGEND - - core = getcore(&type); - print("before RFORK my core no is %ux," - " my coretype is %ux\n", core, type); - - while(rounds-- > 0){ - if(rfork(RFCORE) < 0){ - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - } - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("after RFORK my core no is %ux," - " my coretype is %ux\n", core, type); - } - - if(rfork(RFCCORE) < 0){ - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - } - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("now I am at TC my core no is %ux," - " my coretype is %ux\n", core, type); - } - } - - exits(nil); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/testrfork2.c --- a/sys/src/nix/test.old/testrfork2.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -#include -#include - -/* - rm -f testrfork2.6 - bind /sys/src/9kron/include/libc.h /sys/include/libc.h - bind -c /sys/src/9kron/libc /sys/src/libc - 6c testrfork2.c - 6l -o 6.testrfork2 testrfork2.6 -*/ - -void -usage(void) -{ - fprint(2, "Usage: testrfork\n"); - exits("usage"); -} - -void -main(int argc, char *argv[]) -{ - int i; - int rounds = 2; - int core; - int type; - Waitmsg *msg; - - ARGBEGIN { - default: - usage(); - } - ARGEND - - core = getcore(&type); - print("before RFORK my core no is %ux," - " my coretype is %ux\n", core, type); - - switch(rfork(RFPROC|RFCORE)){ - case -1: - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - case 0: - for(i=0; i < 10; i++){ - core = getcore(&type); - print("child my core no is %ux," - " my coretype is %ux\n", core, type); - } - - if(rfork(RFCCORE) < 0){ - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - } - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("child my core no is %ux," - " my coretype is %ux\n", core, type); - } - - if(rfork(RFCORE) < 0){ - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - } - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("child my core no is %ux," - " my coretype is %ux\n", core, type); - } - - exits(nil); - } - for(i=0; i < 10; i++){ - core = getcore(&type); - print("parent my core no is %ux," - " my coretype is %ux\n", core, type); - } - - if(rfork(RFCORE) < 0){ - fprint(2, "rfork failed: %r\n"); - exits("rfork failed"); - } - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("parent my core no is %ux," - " my coretype is %ux\n", core, type); - } - - while((msg = wait()) != nil){ - if(msg->msg[0] == 0) - print("parent: child pid:%d exited ok\n", msg->pid); - else - print("parent: child pid:%d failed: %s\n", msg->pid, msg->msg); - free(msg); - } - print("parent: done\n"); - - exits(nil); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/testrfork3.c --- a/sys/src/nix/test.old/testrfork3.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -#include -#include - -/* - rm -f testrfork3.6 - bind /sys/src/9kron/include/libc.h /sys/include/libc.h - bind -c /sys/src/9kron/libc /sys/src/libc - 6c -FVTw testrfork3.c - 6l -o 6.testrfork3 testrfork3.6 -*/ - -void -usage(void) -{ - fprint(2, "Usage: testrfork nchilds\n"); - exits("usage"); -} - - -char x[200]; - -void -main(int argc, char *argv[]) -{ - int i; - int c; - int core; - int type; - Waitmsg *msg; - - ARGBEGIN { - default: - usage(); - } - ARGEND - - if(argc != 1) - usage(); - - c = atoi(argv[0]); - if(c <= 0) - usage(); - - core = getcore(&type); - print("parent: before RFORK my core no is %ux," - " my coretype is %ux\n", core, type); - - while(c-- > 0){ - switch(rfork(RFPROC|RFCORE)){ - case -1: - fprint(2, "rfork failed: %r\n"); - break; /* remove to break it */ - case 0: - x[32] = 0xab; - - for(i=0; i < 10; i++){ - core = getcore(&type); - print("child %d my core no is %d," - " my coretype is %d\n", c, core, type); - } - if(c == 0) - exits("calm down, child #0 was supposed to fail"); - exits(nil); - } - } - - while((msg = wait()) != nil){ - if(msg->msg[0] == 0) - print("parent: child pid:%d exited ok\n", msg->pid); - else - print("parent: child pid:%d failed: %s\n", msg->pid, msg->msg); - free(msg); - } - print("parent: done\n"); - exits(nil); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/testrforklock.c --- a/sys/src/nix/test.old/testrforklock.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -#include -#include - -/* - rm -f testrforklock.6 - bind /sys/src/9kron/include/libc.h /sys/include/libc.h - bind -c /sys/src/9kron/libc /sys/src/libc - 6c testrforklock.c - 6l -o 6.testrforklock testrforklock.6 -*/ - -void -usage(void) -{ - fprint(2, "Usage: testrfork nchilds\n"); - exits("usage"); -} - -QLock l; - -void -main(int argc, char *argv[]) -{ - int i; - int c; - int core; - int type; - Waitmsg *msg; - - ARGBEGIN { - default: - usage(); - } - ARGEND - - if(argc != 1) - usage(); - - c = atoi(argv[0]); - if(c <= 0) - usage(); - - core = getcore(&type); - print("parent: my core no is %ux," - " my coretype is %ux\n", core, type); - - while(c-- > 0){ - switch(rfork(RFPROC|RFMEM|RFCORE)){ - case -1: - sysfatal("rfork failed: %r"); - case 0: - core = getcore(&type); - for(i=0; i < 100; i++){ - qlock(&l); - print("child %d my core no is %d," - " my coretype is %d\n", c, core, type); - qunlock(&l); - } - exits(nil); - } - } - while((msg = wait()) != nil){ - if(msg->msg[0] == 0) - print("parent: child pid:%d exited ok\n", msg->pid); - else - print("parent: child pid:%d failed: %s\n", msg->pid, msg->msg); - free(msg); - } - print("parent: done\n"); - exits(nil); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/usem.c --- a/sys/src/nix/test.old/usem.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -#include -#include - -/* - * NIX optimistic semaphores testing. - ! 6c -FTVw usem.c && 6l -o 6.usem usem.6 - */ - -int Nprocs = 5; - - -typedef void (*Testf)(int, int*); - -long ts; /* Plan 9 semaphore for testing */ - -void -downer(int id, int *s) -{ - print("%d: down...\n", id); - - /* - * non blocking - while(downsem(s, 1) < 0) - sleep(1); - */ - - /* - * blocking - */ - downsem(s, 0); - - print("%d: downed\n", id); - semrelease(&ts, 1); - exits(nil); -} - -void -uper(int id, int *s) -{ - print("%d: up...\n", id); - upsem(s); - print("%d: uped\n", id); - semrelease(&ts, 1); - exits(nil); -} - -void -alter(int id, int *s) -{ - - print("%d: alt...\n", id); - altsems(&s, 1); - print("%d: alted\n", id); - semrelease(&ts, 1); - exits(nil); -} - -int nprocs; - -void -semtest(void) -{ - int i, t; - int *s; - struct{ - Testf f; - int fact; - } tests[] = { - {uper, 2}, - {downer, 1}, - {alter, 1}, - }; - - s = mallocz(sizeof *s, 1); - nprocs = 0; - for(t = 0; t < nelem(tests); t++) - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ - case -1: - sysfatal("fork"); - case 0: - for(i = 0; i < tests[t].fact*Nprocs; i++) - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ - case -1: - sysfatal("fork"); - case 0: - tests[t].f(ainc(&nprocs), s); - break; - } - exits(nil); - break; - } - - for(t = 0; t < nelem(tests); t++) - for(i = 0; i < tests[t].fact*Nprocs; i++) - semacquire(&ts, 1); - semstats(); - print("val = %d\n", *s); - free(s); -} - -void -usage(void) -{ - fprint(2, "usage: %s [-n n]\n", argv0); - exits("usage"); -} - -void -main(int argc, char *argv[]) -{ - ARGBEGIN{ - case 'n': - Nprocs = atoi(EARGF(usage())); - break; - default: - usage(); - }ARGEND; - if(argc != 0) - usage(); - - semtest(); - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/utube.c --- a/sys/src/nix/test.old/utube.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -#include -#include -#include - -/* - * NIX tubes testing. - ! 6c -FTVw utube.c && 6l -o 6.utube utube.6 - */ - -int Nprocs = 5; - - -typedef void (*Testf)(int, Tube*); - -long ts; /* Plan 9 semaphore for testing */ - -void -trecver(int id, Tube *t) -{ - ulong n; - - print("%d: recv...\n", id); - trecv(t, &n); - print("%d: recved: %uld\n", id, n); - semrelease(&ts, 1); - exits(nil); -} - -void -tsender(int id, Tube *t) -{ - ulong n; - - n = id; - print("%d: send...\n", id); - tsend(t, &n); - print("%d: sent\n", id); - semrelease(&ts, 1); - exits(nil); -} - -void -talter(int id, Tube *t) -{ - ulong n; - Talt alts[] = { - {t, &n, TRCV}, - }; - - n = id; - print("%d: alt...\n", id); - if(talt(alts, nelem(alts)) != 0) - abort(); - print("%d: alted: %uld\n", id, n); - semrelease(&ts, 1); - exits(nil); -} - -void -talterduo(int id, Tube *t) -{ - ulong n; - Tube *t2; - ulong n2; - Talt alts[] = { - {t, &n, TRCV}, - {nil, &n2, TRCV}, - }; - - t2 = newtube(sizeof(ulong), 1); - alts[1].t = t2; - - switch(rfork(RFPROC|RFMEM)){ - case -1: - sysfatal("fork"); - case 0: - sleep(1); - tsender(-id, t2); - exits(nil); - } - n = id; - print("%d: alt...\n", id); - switch(talt(alts, nelem(alts))){ - case 0: - break; - case 1: - print("%d: alting...\n", id); - trecv(t, &n); - break; - default: - sysfatal("alt"); - } - print("%d: alted: %uld\n", id, n); - semrelease(&ts, 1); - exits(nil); -} - -long nprocs; - -void -tubetest(void) -{ - int i, j, t; - long n; - Tube *tb; - struct{ - Testf f; - int fact; - } tests[] = { - {tsender, 1}, - {trecver, 1}, - {tsender, 1}, - {talter, 1}, - -// {tsender, 1}, -// {trecver, 1}, -// {tsender, 1}, -// {talterduo, 1}, - }; - - tb = newtube(sizeof(ulong), Nprocs/2); - for(t = 0; t < nelem(tests); t++) - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ - case -1: - sysfatal("fork"); - case 0: - n = 0; - for(j = 0; j < t; j++) - n += tests[j].fact*Nprocs; - for(i = 0; i < tests[t].fact*Nprocs; i++) - switch(rfork(RFPROC|RFMEM|RFNOWAIT)){ - case -1: - sysfatal("fork"); - case 0: - tests[t].f(n+i, tb); - break; - } - exits(nil); - break; - } - - for(t = 0; t < nelem(tests); t++) - for(i = 0; i < tests[t].fact*Nprocs; i++) - semacquire(&ts, 1); - semstats(); - print("hole %ld msg %ld\n", tb->nhole, tb->nmsg); -} - -void -usage(void) -{ - fprint(2, "usage: %s [-n n]\n", argv0); - exits("usage"); -} - -void -main(int argc, char *argv[]) -{ - ARGBEGIN{ - case 'n': - Nprocs = atoi(EARGF(usage())); - break; - default: - usage(); - }ARGEND; - if(argc != 0) - usage(); - - tubetest(); - exits(nil); -} diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/x.c --- a/sys/src/nix/test.old/x.c Wed Sep 14 10:45:47 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - !6c x.c && 6l -o 6.x x.6 - */ - -#include -#include - -u64int zzz = 0xdeadbeebdeadbeebull; - -void f(void); -void -f(void) -{ - if(write(2, "Pi\n", 3) == 3) - write(2, "3\n", 2); - write(2, "Pi\n", 3); -} - - -void -main(int argc, char*argv[]) -{ - int x; - int *y; - - - if(zzz == 0xdeadbeebdeadbeebull) - write(2, "Ok2\n", 4); - f(); - y = &x; - *y = 3; - write(2, "hola", 4); - if(*y == 3) - write(2, "ok\n", 3); - exits("xxx"); -} - diff -r 2ca754dc5aff -r 74ae106c3ac5 sys/src/nix/test.old/xxx Binary file sys/src/nix/test.old/xxx has changed