# HG changeset patch # User Ron Minnich # Date 1317833356 -7200 # Node ID 67cc780fd7fe46bc541a45e06539c988cb3a3b4c # Parent d35aa1876a61a4e24b84de748125aa83ed106a4f lib/ape/.shutuphg: tell hg to STFU sys/src/libthread/channel.acid: hg bug sys/src/libthread/sched.acid: hg bug R=nix-dev, noah.evans CC=nix-dev http://codereview.appspot.com/4959051 Committer: Noah Evans diff -r d35aa1876a61 -r 67cc780fd7fe sys/src/libthread/channel.acid --- a/sys/src/libthread/channel.acid Wed Oct 05 17:55:49 2011 +0200 +++ b/sys/src/libthread/channel.acid Wed Oct 05 18:49:16 2011 +0200 @@ -35,21 +35,21 @@ Runesync = 128; Runeself = 128; Runeerror = 65533; -sizeofFmt = 48; +sizeofFmt = 80; aggr Fmt { 'b' 0 runes; - 'X' 4 start; - 'X' 8 to; - 'X' 12 stop; - 'X' 16 flush; - 'X' 20 farg; - 'D' 24 nfmt; - 'X' 28 args; - 'D' 32 r; - 'D' 36 width; - 'D' 40 prec; - 'U' 44 flags; + 'X' 8 start; + 'X' 16 to; + 'X' 24 stop; + 'X' 32 flush; + 'X' 40 farg; + 'D' 48 nfmt; + 'X' 56 args; + 'D' 64 r; + 'D' 68 width; + 'D' 72 prec; + 'U' 76 flags; }; defn @@ -120,7 +120,7 @@ Profkernel = 2; Proftime = 3; Profsample = 4; -sizeofLock = 4; +sizeofLock = 8; aggr Lock { 'D' 0 val; @@ -132,12 +132,12 @@ print(" val ", addr.val, "\n"); }; -sizeofQLp = 12; +sizeofQLp = 24; aggr QLp { 'D' 0 inuse; - 'A' QLp 4 next; - 'C' 8 state; + 'A' QLp 8 next; + 'C' 16 state; }; defn @@ -148,13 +148,13 @@ print(" state ", addr.state, "\n"); }; -sizeofQLock = 16; +sizeofQLock = 32; aggr QLock { Lock 0 lock; - 'D' 4 locked; - 'A' QLp 8 $head; - 'A' QLp 12 $tail; + 'D' 8 locked; + 'A' QLp 16 $head; + 'A' QLp 24 $tail; }; defn @@ -168,14 +168,14 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofRWLock = 20; +sizeofRWLock = 32; aggr RWLock { Lock 0 lock; - 'D' 4 readers; - 'D' 8 writer; - 'A' QLp 12 $head; - 'A' QLp 16 $tail; + 'D' 8 readers; + 'D' 12 writer; + 'A' QLp 16 $head; + 'A' QLp 24 $tail; }; defn @@ -190,12 +190,12 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofRendez = 12; +sizeofRendez = 24; aggr Rendez { 'A' QLock 0 l; - 'A' QLp 4 $head; - 'A' QLp 8 $tail; + 'A' QLp 8 $head; + 'A' QLp 16 $tail; }; defn @@ -206,18 +206,18 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofNetConnInfo = 36; +sizeofNetConnInfo = 72; aggr NetConnInfo { 'X' 0 dir; - 'X' 4 root; - 'X' 8 spec; - 'X' 12 lsys; - 'X' 16 lserv; - 'X' 20 rsys; - 'X' 24 rserv; - 'X' 28 laddr; - 'X' 32 raddr; + 'X' 8 root; + 'X' 16 spec; + 'X' 24 lsys; + 'X' 32 lserv; + 'X' 40 rsys; + 'X' 48 rserv; + 'X' 56 laddr; + 'X' 64 raddr; }; defn @@ -262,7 +262,7 @@ print(" type ", addr.type, "\n"); }; -sizeofDir = 60; +sizeofDir = 80; aggr Dir { 'u' 0 type; @@ -271,11 +271,11 @@ 'U' 24 mode; 'U' 28 atime; 'U' 32 mtime; - 'V' 36 length; - 'X' 44 name; - 'X' 48 uid; - 'X' 52 gid; - 'X' 56 muid; + 'V' 40 length; + 'X' 48 name; + 'X' 56 uid; + 'X' 64 gid; + 'X' 72 muid; }; defn @@ -296,7 +296,7 @@ print(" muid ", addr.muid\X, "\n"); }; -sizeofWaitmsg = 20; +sizeofWaitmsg = 24; aggr Waitmsg { 'D' 0 pid; @@ -312,11 +312,11 @@ print(" msg ", addr.msg\X, "\n"); }; -sizeofIOchunk = 8; +sizeofIOchunk = 16; aggr IOchunk { 'X' 0 addr; - 'U' 4 len; + 'U' 8 len; }; defn @@ -330,7 +330,7 @@ Nqshift = 5; Nqmask = -1; Nqbits = 64; -sizeofChannel = 36; +sizeofChannel = 48; aggr Channel { 'D' 0 s; @@ -338,10 +338,10 @@ 'U' 8 n; 'D' 12 e; 'D' 16 freed; - 'X' 20 qentry; - 'D' 24 nentry; - 'D' 28 closed; - 'a' 32 v; + 'X' 24 qentry; + 'D' 32 nentry; + 'D' 36 closed; + 'a' 40 v; }; defn @@ -363,15 +363,15 @@ CHANRCV = 2; CHANNOP = 3; CHANNOBLK = 4; -sizeofAlt = 24; +sizeofAlt = 48; aggr Alt { 'A' Channel 0 c; - 'X' 4 v; - 'D' 8 op; - 'X' 12 err; - 'A' Channel 16 tag; - 'D' 20 entryno; + 'X' 8 v; + 'D' 16 op; + 'X' 24 err; + 'A' Channel 32 tag; + 'D' 40 entryno; }; defn @@ -385,7 +385,7 @@ print(" entryno ", addr.entryno, "\n"); }; -sizeofRef = 4; +sizeofRef = 8; aggr Ref { 'D' 0 ref; @@ -408,11 +408,11 @@ RENDHASH = 13; Printsize = 2048; NPRIV = 8; -sizeofRgrp = 56; +sizeofRgrp = 112; aggr Rgrp { Lock 0 lock; - 'a' 4 hash; + 'a' 8 hash; }; defn @@ -424,12 +424,12 @@ print(" hash ", addr.hash, "\n"); }; -sizeofTqueue = 12; +sizeofTqueue = 24; aggr Tqueue { 'D' 0 asleep; - 'X' 4 $head; - 'X' 8 $tail; + 'X' 8 $head; + 'X' 16 $tail; }; defn @@ -440,31 +440,31 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofThread = 120; +sizeofThread = 216; aggr Thread { Lock 0 lock; - 'a' 4 sched; - 'D' 12 id; - 'D' 16 grp; - 'D' 20 moribund; - 'D' 24 state; - 'D' 28 nextstate; - 'X' 32 stk; - 'U' 36 stksize; - 'A' Thread 40 next; - 'X' 44 proc; - 'A' Thread 48 nextt; - 'D' 52 ret; - 'X' 56 cmdname; - 'D' 60 inrendez; - 'A' Thread 64 rendhash; - 'X' 68 rendtag; - 'X' 72 rendval; - 'D' 76 rendbreak; - 'D' 80 chan; - 'A' Alt 84 alt; - 'a' 88 udata; + 'a' 8 sched; + 'D' 24 id; + 'D' 28 grp; + 'D' 32 moribund; + 'D' 36 state; + 'D' 40 nextstate; + 'X' 48 stk; + 'U' 56 stksize; + 'A' Thread 64 next; + 'X' 72 proc; + 'A' Thread 80 nextt; + 'D' 88 ret; + 'X' 96 cmdname; + 'D' 104 inrendez; + 'A' Thread 112 rendhash; + 'X' 120 rendtag; + 'X' 128 rendval; + 'D' 136 rendbreak; + 'D' 140 chan; + 'A' Alt 144 alt; + 'a' 152 udata; }; defn @@ -496,12 +496,12 @@ print(" udata ", addr.udata, "\n"); }; -sizeofExecargs = 16; +sizeofExecargs = 24; aggr Execargs { 'X' 0 prog; - 'X' 4 args; - 'a' 8 fd; + 'X' 8 args; + 'a' 16 fd; }; defn @@ -512,34 +512,34 @@ print(" fd ", addr.fd, "\n"); }; -sizeofProc = 2424; +sizeofProc = 2504; aggr Proc { Lock 0 lock; - 'a' 4 sched; - 'D' 12 pid; - 'D' 16 splhi; - 'A' Thread 20 thread; - 'D' 24 needexec; - Execargs 28 exec; - 'A' Proc 44 newproc; - 'a' 48 exitstr; - 'D' 176 rforkflag; - 'D' 180 nthreads; - Tqueue 184 threads; - Tqueue 196 ready; - Lock 208 readylock; - 'a' 212 printbuf; - 'D' 2260 blocked; - 'D' 2264 pending; - 'D' 2268 nonotes; - 'U' 2272 nextID; - 'A' Proc 2276 next; - 'X' 2280 arg; - 'a' 2284 str; - 'X' 2412 wdata; - 'X' 2416 udata; - 'C' 2420 threadint; + 'a' 8 sched; + 'D' 24 pid; + 'D' 28 splhi; + 'A' Thread 32 thread; + 'D' 40 needexec; + Execargs 48 exec; + 'A' Proc 72 newproc; + 'a' 80 exitstr; + 'D' 208 rforkflag; + 'D' 212 nthreads; + Tqueue 216 threads; + Tqueue 240 ready; + Lock 264 readylock; + 'a' 272 printbuf; + 'D' 2320 blocked; + 'D' 2324 pending; + 'D' 2328 nonotes; + 'U' 2332 nextID; + 'A' Proc 2336 next; + 'X' 2344 arg; + 'a' 2352 str; + 'X' 2480 wdata; + 'X' 2488 udata; + 'C' 2496 threadint; }; defn @@ -582,12 +582,12 @@ print(" threadint ", addr.threadint, "\n"); }; -sizeofPqueue = 12; +sizeofPqueue = 24; aggr Pqueue { Lock 0 lock; - 'A' Proc 4 $head; - 'A' Proc 8 $tail; + 'A' Proc 8 $head; + 'A' Proc 16 $tail; }; defn @@ -600,18 +600,18 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofIoproc = 160; +sizeofIoproc = 192; aggr Ioproc { 'D' 0 tid; - 'A' Channel 4 c; - 'A' Channel 8 creply; - 'D' 12 inuse; - 'X' 16 op; - 'X' 20 arg; - 'D' 24 ret; - 'a' 28 err; - 'A' Ioproc 156 next; + 'A' Channel 8 c; + 'A' Channel 16 creply; + 'D' 24 inuse; + 'X' 32 op; + 'X' 40 arg; + 'D' 48 ret; + 'a' 52 err; + 'A' Ioproc 184 next; }; defn diff -r d35aa1876a61 -r 67cc780fd7fe sys/src/libthread/sched.acid --- a/sys/src/libthread/sched.acid Wed Oct 05 17:55:49 2011 +0200 +++ b/sys/src/libthread/sched.acid Wed Oct 05 18:49:16 2011 +0200 @@ -35,21 +35,21 @@ Runesync = 128; Runeself = 128; Runeerror = 65533; -sizeofFmt = 48; +sizeofFmt = 80; aggr Fmt { 'b' 0 runes; - 'X' 4 start; - 'X' 8 to; - 'X' 12 stop; - 'X' 16 flush; - 'X' 20 farg; - 'D' 24 nfmt; - 'X' 28 args; - 'D' 32 r; - 'D' 36 width; - 'D' 40 prec; - 'U' 44 flags; + 'X' 8 start; + 'X' 16 to; + 'X' 24 stop; + 'X' 32 flush; + 'X' 40 farg; + 'D' 48 nfmt; + 'X' 56 args; + 'D' 64 r; + 'D' 68 width; + 'D' 72 prec; + 'U' 76 flags; }; defn @@ -120,7 +120,7 @@ Profkernel = 2; Proftime = 3; Profsample = 4; -sizeofLock = 4; +sizeofLock = 8; aggr Lock { 'D' 0 val; @@ -132,12 +132,12 @@ print(" val ", addr.val, "\n"); }; -sizeofQLp = 12; +sizeofQLp = 24; aggr QLp { 'D' 0 inuse; - 'A' QLp 4 next; - 'C' 8 state; + 'A' QLp 8 next; + 'C' 16 state; }; defn @@ -148,13 +148,13 @@ print(" state ", addr.state, "\n"); }; -sizeofQLock = 16; +sizeofQLock = 32; aggr QLock { Lock 0 lock; - 'D' 4 locked; - 'A' QLp 8 $head; - 'A' QLp 12 $tail; + 'D' 8 locked; + 'A' QLp 16 $head; + 'A' QLp 24 $tail; }; defn @@ -168,14 +168,14 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofRWLock = 20; +sizeofRWLock = 32; aggr RWLock { Lock 0 lock; - 'D' 4 readers; - 'D' 8 writer; - 'A' QLp 12 $head; - 'A' QLp 16 $tail; + 'D' 8 readers; + 'D' 12 writer; + 'A' QLp 16 $head; + 'A' QLp 24 $tail; }; defn @@ -190,12 +190,12 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofRendez = 12; +sizeofRendez = 24; aggr Rendez { 'A' QLock 0 l; - 'A' QLp 4 $head; - 'A' QLp 8 $tail; + 'A' QLp 8 $head; + 'A' QLp 16 $tail; }; defn @@ -206,18 +206,18 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofNetConnInfo = 36; +sizeofNetConnInfo = 72; aggr NetConnInfo { 'X' 0 dir; - 'X' 4 root; - 'X' 8 spec; - 'X' 12 lsys; - 'X' 16 lserv; - 'X' 20 rsys; - 'X' 24 rserv; - 'X' 28 laddr; - 'X' 32 raddr; + 'X' 8 root; + 'X' 16 spec; + 'X' 24 lsys; + 'X' 32 lserv; + 'X' 40 rsys; + 'X' 48 rserv; + 'X' 56 laddr; + 'X' 64 raddr; }; defn @@ -262,7 +262,7 @@ print(" type ", addr.type, "\n"); }; -sizeofDir = 60; +sizeofDir = 80; aggr Dir { 'u' 0 type; @@ -271,11 +271,11 @@ 'U' 24 mode; 'U' 28 atime; 'U' 32 mtime; - 'V' 36 length; - 'X' 44 name; - 'X' 48 uid; - 'X' 52 gid; - 'X' 56 muid; + 'V' 40 length; + 'X' 48 name; + 'X' 56 uid; + 'X' 64 gid; + 'X' 72 muid; }; defn @@ -296,7 +296,7 @@ print(" muid ", addr.muid\X, "\n"); }; -sizeofWaitmsg = 20; +sizeofWaitmsg = 24; aggr Waitmsg { 'D' 0 pid; @@ -312,11 +312,11 @@ print(" msg ", addr.msg\X, "\n"); }; -sizeofIOchunk = 8; +sizeofIOchunk = 16; aggr IOchunk { 'X' 0 addr; - 'U' 4 len; + 'U' 8 len; }; defn @@ -330,7 +330,7 @@ Nqshift = 5; Nqmask = -1; Nqbits = 64; -sizeofChannel = 36; +sizeofChannel = 48; aggr Channel { 'D' 0 s; @@ -338,10 +338,10 @@ 'U' 8 n; 'D' 12 e; 'D' 16 freed; - 'X' 20 qentry; - 'D' 24 nentry; - 'D' 28 closed; - 'a' 32 v; + 'X' 24 qentry; + 'D' 32 nentry; + 'D' 36 closed; + 'a' 40 v; }; defn @@ -363,15 +363,15 @@ CHANRCV = 2; CHANNOP = 3; CHANNOBLK = 4; -sizeofAlt = 24; +sizeofAlt = 48; aggr Alt { 'A' Channel 0 c; - 'X' 4 v; - 'D' 8 op; - 'X' 12 err; - 'A' Channel 16 tag; - 'D' 20 entryno; + 'X' 8 v; + 'D' 16 op; + 'X' 24 err; + 'A' Channel 32 tag; + 'D' 40 entryno; }; defn @@ -385,7 +385,7 @@ print(" entryno ", addr.entryno, "\n"); }; -sizeofRef = 4; +sizeofRef = 8; aggr Ref { 'D' 0 ref; @@ -408,11 +408,11 @@ RENDHASH = 13; Printsize = 2048; NPRIV = 8; -sizeofRgrp = 56; +sizeofRgrp = 112; aggr Rgrp { Lock 0 lock; - 'a' 4 hash; + 'a' 8 hash; }; defn @@ -424,12 +424,12 @@ print(" hash ", addr.hash, "\n"); }; -sizeofTqueue = 12; +sizeofTqueue = 24; aggr Tqueue { 'D' 0 asleep; - 'X' 4 $head; - 'X' 8 $tail; + 'X' 8 $head; + 'X' 16 $tail; }; defn @@ -440,31 +440,31 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofThread = 120; +sizeofThread = 216; aggr Thread { Lock 0 lock; - 'a' 4 sched; - 'D' 12 id; - 'D' 16 grp; - 'D' 20 moribund; - 'D' 24 state; - 'D' 28 nextstate; - 'X' 32 stk; - 'U' 36 stksize; - 'A' Thread 40 next; - 'X' 44 proc; - 'A' Thread 48 nextt; - 'D' 52 ret; - 'X' 56 cmdname; - 'D' 60 inrendez; - 'A' Thread 64 rendhash; - 'X' 68 rendtag; - 'X' 72 rendval; - 'D' 76 rendbreak; - 'D' 80 chan; - 'A' Alt 84 alt; - 'a' 88 udata; + 'a' 8 sched; + 'D' 24 id; + 'D' 28 grp; + 'D' 32 moribund; + 'D' 36 state; + 'D' 40 nextstate; + 'X' 48 stk; + 'U' 56 stksize; + 'A' Thread 64 next; + 'X' 72 proc; + 'A' Thread 80 nextt; + 'D' 88 ret; + 'X' 96 cmdname; + 'D' 104 inrendez; + 'A' Thread 112 rendhash; + 'X' 120 rendtag; + 'X' 128 rendval; + 'D' 136 rendbreak; + 'D' 140 chan; + 'A' Alt 144 alt; + 'a' 152 udata; }; defn @@ -496,12 +496,12 @@ print(" udata ", addr.udata, "\n"); }; -sizeofExecargs = 16; +sizeofExecargs = 24; aggr Execargs { 'X' 0 prog; - 'X' 4 args; - 'a' 8 fd; + 'X' 8 args; + 'a' 16 fd; }; defn @@ -512,34 +512,34 @@ print(" fd ", addr.fd, "\n"); }; -sizeofProc = 2424; +sizeofProc = 2504; aggr Proc { Lock 0 lock; - 'a' 4 sched; - 'D' 12 pid; - 'D' 16 splhi; - 'A' Thread 20 thread; - 'D' 24 needexec; - Execargs 28 exec; - 'A' Proc 44 newproc; - 'a' 48 exitstr; - 'D' 176 rforkflag; - 'D' 180 nthreads; - Tqueue 184 threads; - Tqueue 196 ready; - Lock 208 readylock; - 'a' 212 printbuf; - 'D' 2260 blocked; - 'D' 2264 pending; - 'D' 2268 nonotes; - 'U' 2272 nextID; - 'A' Proc 2276 next; - 'X' 2280 arg; - 'a' 2284 str; - 'X' 2412 wdata; - 'X' 2416 udata; - 'C' 2420 threadint; + 'a' 8 sched; + 'D' 24 pid; + 'D' 28 splhi; + 'A' Thread 32 thread; + 'D' 40 needexec; + Execargs 48 exec; + 'A' Proc 72 newproc; + 'a' 80 exitstr; + 'D' 208 rforkflag; + 'D' 212 nthreads; + Tqueue 216 threads; + Tqueue 240 ready; + Lock 264 readylock; + 'a' 272 printbuf; + 'D' 2320 blocked; + 'D' 2324 pending; + 'D' 2328 nonotes; + 'U' 2332 nextID; + 'A' Proc 2336 next; + 'X' 2344 arg; + 'a' 2352 str; + 'X' 2480 wdata; + 'X' 2488 udata; + 'C' 2496 threadint; }; defn @@ -582,12 +582,12 @@ print(" threadint ", addr.threadint, "\n"); }; -sizeofPqueue = 12; +sizeofPqueue = 24; aggr Pqueue { Lock 0 lock; - 'A' Proc 4 $head; - 'A' Proc 8 $tail; + 'A' Proc 8 $head; + 'A' Proc 16 $tail; }; defn @@ -600,18 +600,18 @@ print(" $tail ", addr.$tail\X, "\n"); }; -sizeofIoproc = 160; +sizeofIoproc = 192; aggr Ioproc { 'D' 0 tid; - 'A' Channel 4 c; - 'A' Channel 8 creply; - 'D' 12 inuse; - 'X' 16 op; - 'X' 20 arg; - 'D' 24 ret; - 'a' 28 err; - 'A' Ioproc 156 next; + 'A' Channel 8 c; + 'A' Channel 16 creply; + 'D' 24 inuse; + 'X' 32 op; + 'X' 40 arg; + 'D' 48 ret; + 'a' 52 err; + 'A' Ioproc 184 next; }; defn @@ -631,15 +631,15 @@ complex Pqueue _threadpq; complex Channel _threadwaitchan; complex Rgrp _threadrgrp; -sizeof_2_ = 24; +sizeof_2_ = 40; aggr _2_ { 'X' 0 pp; - 'X' 4 next; - 'X' 8 last; - 'X' 12 first; - 'U' 16 pid; - 'U' 20 what; + 'X' 8 next; + 'X' 16 last; + 'X' 24 first; + 'U' 32 pid; + 'U' 36 what; }; defn @@ -653,15 +653,15 @@ print(" what ", addr.what, "\n"); }; -sizeofTos = 56; +sizeofTos = 72; aggr Tos { _2_ 0 prof; - 'W' 24 cyclefreq; - 'V' 32 kcycles; - 'V' 40 pcycles; - 'U' 48 pid; - 'U' 52 clock; + 'W' 40 cyclefreq; + 'V' 48 kcycles; + 'V' 56 pcycles; + 'U' 64 pid; + 'U' 68 clock; }; defn