clean up nits in fs portable code: use Mpl in proc.c rather than int, sort portfns, and make console help style consistent. Reference: /n/atom/patch/applied2013/fsprtnit20130914 Date: Sun Sep 15 05:23:42 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/port/con.c Sun Sep 15 05:23:16 2013 +++ /sys/src/fs/port/con.c Sun Sep 15 05:23:18 2013 @@ -799,7 +799,7 @@ { cmd_install("cfs", "[file] -- set current filesystem", cmd_cfs); cmd_install("clean", "file [bno [addr]] -- block print/fix", cmd_clean); - cmd_install("check", "[options]", cmd_check); + cmd_install("check", "[options] -- check filesystem", cmd_check); cmd_install("clri", "[file ...] -- purge files/dirs", cmd_clri); cmd_install("create", "path uid gid perm [lad] -- make a file/dir", cmd_create); cmd_install("date", "[[+-]seconds] -- print/set date", cmd_date); @@ -815,7 +815,7 @@ cmd_install("rawcopy", "from to -- copy device", cmd_rawcopy); cmd_install("stata", "-- overall stats", cmd_stata); cmd_install("stats", "[[-]flags ...] -- various stats", cmd_stats); - cmd_install("sync", "", cmd_sync); + cmd_install("sync", "-- push dirty blocks to disk", cmd_sync); cmd_install("time", "command -- time another command", cmd_time); cmd_install("users", "[file] -- read /adm/users", cmd_users); cmd_install("version", "-- print time of mk and boot", cmd_version); @@ -823,8 +823,8 @@ cmd_install("hangup", "chan -- clunk files", cmd_hangup); cmd_install("passwd", "passwd -- set passkey, id, and domain", cmd_passwd); cmd_install("printconf", "-- print configuration", cmd_printconf); - cmd_install("noattach", "toggle noattach flag", cmd_noattach); - cmd_install("files", "report on files structure", cmd_files); + cmd_install("noattach", "-- toggle noattach flag", cmd_noattach); + cmd_install("files", "-- report on files structure", cmd_files); cmd_install("writeconf", "-- write configuration", cmd_writeconf); attachflag = flag_install("attach", "-- attach calls"); --- /sys/src/fs/port/proc.c Sun Sep 15 05:23:20 2013 +++ /sys/src/fs/port/proc.c Sun Sep 15 05:23:22 2013 @@ -230,7 +230,7 @@ sleep(Rendez *r, int (*f)(void*), void *arg) { User *p; - int s; + Mpl s; if(u->nlock){ print("user %d sleeps with %lud at %#p\n", u->pid, u->nlock, getcallerpc(&r)); @@ -258,7 +258,7 @@ * change state and call scheduler */ p = r->p; - if(p) + if(p != nil) print("double sleep pid %d/%#p %d\n", u->pid, getcallerpc(&r), p->pid); u->state = Wakeme; r->p = u; --- /sys/src/fs/port/portfns.h Sun Sep 15 05:23:26 2013 +++ /sys/src/fs/port/portfns.h Sun Sep 15 05:23:27 2013 @@ -1,73 +1,70 @@ -void bufprint(int); - void accessdir(Iobuf*, Dentry*, int, int); void addfree(Device*, Off, Superb*); -void arpstart(void); void apcinit(void); void archmach0init(Mach*); void arginit(void); +void arpstart(void); void _assert(char*); void atexit(void (*)(void*), void*); char* authaname(Auth*); -void authinit(void); void authfree(Auth*); +void authinit(void); Auth* authnew(char*, char*); int authread(File*, uchar*, int); int authuid(Auth*); char* authuname(Auth*); int authwrite(File*, uchar*, int); -Off byteio(Device*, int, uvlong, ulong, void*); -void cdiag(char*, int); -Device* config(void); -void cpuidentify(void); -int rawchar(int); Off bufalloc(Device*, int, long, int); void buffree(Device*, Off, int, Truncstate *); +void bufprint(int); +Off byteio(Device*, int, uvlong, ulong, void*); int byuid(void*, void*); int canlock(Lock*); int canqlock(QLock*); +void cdiag(char*, int); int cecgetc(void); void cecinit(void); void cecputs(char*, int); void cfsdump(Filsys*); Chan* chaninit(int, int, int); +int checkname(char*); +int checktag(Iobuf*, int, Off); +void clockinit(void); +void clockreload(Timet); +void clock(Timet, uintptr); void cmd_check(int, char*[]); void cmd_devcopy(int, char*[]); -void cmd_users(int, char*[]); -void cmd_newuser(int, char*[]); +void cmd_exec(char*); +void cmd_install(char*, char*, void (*)(int, char*[])); void cmd_netdb(int, char*[]); +void cmd_newuser(int, char*[]); void cmd_passwd(int, char*[]); void cmd_printconf(int, char*[]); void cmd_rawcopy(int, char*[]); +void cmd_users(int, char*[]); void cmd_writeconf(int, char*[]); -int checkname(char*); -int checktag(Iobuf*, int, Off); -void clock(Timet, uintptr); -void clockinit(void); -void clockreload(Timet); -void devcopyproc(void); -Device* devstr(char*); -void dotrace(int); -void consinit(void); -void consreset(void); -int consgetc(void); -void consputs(char*, int); -void consserve(void); -int conslock(void); int con_attach(int, char*, char*); int con_clone(int, int); -int con_create(int, char*, int, int, long, int); int con_clri(int); +int con_create(int, char*, int, int, long, int); +Device* config(void); int con_fstat(int); int con_open(int, int); int con_read(int, char*, Off, int); int con_remove(int); void con_rintr(int); int con_session(void); +int consgetc(void); +void consinit(void); +int conslock(void); +void consputs(char*, int); +void consreset(void); +void consserve(void); int con_walk(int, char*); int con_write(int, char*, Off, int); -int cwgrow(Device*, Superb*, int); +void cpuidentify(void); int cwfree(Device*, Off); +int cwgrow(Device*, Superb*, int); void cwinit(Device*); Off cwraddr(Device*); int cwread(Device*, Off, void*); @@ -80,17 +77,20 @@ Off dbufread(Iobuf*, Dentry*, Off, Off, int); void delay(int); int devcmpr(Device*, Device*); -void devream(Device*, int); -void devrecover(Device*); +void devcopyproc(void); void devinit(Device*); int devread(Device*, Off, void*); +void devream(Device*, int); +void devrecover(Device*); int devsecsize(Device*); Devsize devsize(Device*); +Device* devstr(char*); int devwrite(Device*, Off, void*); -Iobuf* dnodebuf(Iobuf*, Dentry*, Off, int, int); Iobuf* dnodebuf1(Iobuf*, Dentry*, Off, int, int); +Iobuf* dnodebuf(Iobuf*, Dentry*, Off, int, int); void dofilter(Filter*); int doremove(File*); +void dotrace(int); void dtrunc(Iobuf*, Dentry*, int); int dtrunclen(Iobuf *p, Dentry *, Off newsize, int uid); int dumpblock(Device*); @@ -102,91 +102,92 @@ void fileinit(Chan*); File* filep(Chan*, ulong, int); void firmware(void); +ulong flag_install(char*, char*); int fname(char*); void formatinit(void); void freefp(File*); void freewp(Wpath*); Filsys* fsstr(char*); -Devsize fwormsize(Device*); -void fwormream(Device*, int); void fworminit(Device*); int fwormread(Device*, Off, void*); +void fwormream(Device*, int); +Devsize fwormsize(Device*); int fwormwrite(Device*, Off, void*); char* getauthlist(void); Iobuf* getbuf(Device*, Off, int); -char* getwd(char*, char*); -int getc(void); uintptr getcallerpc(void*); +int getc(void); Dentry* getdir(Iobuf*, int); Chan* getlcp(uchar*, long); Off getraddr(Device*); void getstring(char*, int, int); +char* getwd(char*, char*); void gotolabel(Label*); void hexdump(void*, int); int iaccess(File*, Dentry*, int); void* ialloc(uintptr, int); void ilock(Lock*); -void iunlock(Lock*); Off indfetch(Device*, Off, Off, Off , int, int, int); int ingroup(int, int); int inh(int, uchar*); void init0(void); void iobufinit(void); void* iobufmap(Iobuf*); -void iobufunmap(Iobuf*); int iobufql(QLock*); -int jukeread(Device*, Off, void*); -int jukewrite(Device*, Off, void*); +void iobufunmap(Iobuf*); +void iunlock(Lock*); void jukeinit(Device*); +int jukeread(Device*, Off, void*); void jukerecover(Device*); Off jukesaddr(Device*); Devsize jukesize(Device*); +int jukewrite(Device*, Off, void*); void kbdchar(int); -void lights(int, int); void launchhalt(void); void launchinit(void); -void localconfinit(void); int leadgroup(int, int); -void lock(Lock*); +void lights(int, int); +void localconfinit(void); void lockinit(void); +void lock(Lock*); void machinit(void); Msgbuf* mballoc(int, Chan*, int); void mballocpool(int, int, int, int, void (*)(Msgbuf*)); -void mbinit(void); void mbfree(Msgbuf*); -uintmem meminit(void); -Iobuf* movebuf(Iobuf*); +void mbinit(void); void mcatinit(Device*); int mcatread(Device*, Off, void*); Devsize mcatsize(Device*); int mcatwrite(Device*, Off, void*); +uintmem meminit(void); void mirrinit(Device*); int mirrread(Device*, Off, void*); Devsize mirrsize(Device*); int mirrwrite(Device*, Off, void*); -void mkqid(Qid*, Dentry*, int); -int mkqidcmp(Qid*, Dentry*); void mkqid9p1(Qid9p1*, Qid*); void mkqid9p2(Qid*, Qid9p1*, int); +int mkqidcmp(Qid*, Dentry*); +void mkqid(Qid*, Dentry*, int); void mlevinit(Device*); int mlevread(Device*, Off, void*); Devsize mlevsize(Device*); int mlevwrite(Device*, Off, void*); +Iobuf* movebuf(Iobuf*); void mwormream(Device*, int); int nametokey(char*, char*); +Auth* newauth(void); File* newfp(void); User* newproc(void); Queue* newqueue(int); Wpath* newwp(void); -Auth* newauth(void); +Timet nextime(Timet, int, int); +int no(void*); +vlong number(char*, int, int); int nvrcheck(void); int nvread(int, void*, int); char* nvrgetconfig(void); int nvrsetconfig(char*); int nvwrite(int, void*, int); -int walkto(char*); -int no(void*); -vlong number(char*, int, int); void online(void); void otherinit(void); void panic(char*, ...); @@ -198,9 +199,9 @@ void prdate(void); void preread(Device*, Off); void prflush(void); -void printlocks(User*); int prime(vlong); void printinit(void); +void printlocks(User*); void procinit(void); void profinit(void); void putbuf(Iobuf*); @@ -208,37 +209,39 @@ Off qidpathgen(Device*); void qlock(QLock*); void qunlock(QLock*); -void rahead(void); void raheadsort(void); -void ready(User*); +void rahead(void); +int rawchar(int); void rawcopyproc(void); +void ready(User*); void ream(Filsys*); void* recv(Queue*, int); void rlock(RWlock*); +void roinit(Device*); void rootream(Device*, Off); int roread(Device*, Off, void*); -void roinit(Device*); int rowrite(Device*, Off, void*); Timet rtc2sec(Rtc *); +Timet rtctime(void); void runlock(RWlock*); User* runproc(void); -void sched(void); void schedinit(void); +void sched(void); int scsiio(Device*, int, uchar*, int, void*, int); void sec2rtc(Timet, Rtc *); void send(Queue*, void*); -void serve(void); int serve9p(Msgbuf*); +void serve(void); int setlabel(Label*); +void setrtc(Timet); void settag(Iobuf*, int, long); void settime(Timet); void sleep(Rendez*, int(*)(void*), void*); void sntpinit(void); -int strtouid(char*); int strtoipflag(char*); +int strtouid(char*); Off superaddr(Device*); void superream(Device*, Off); -void swab(void*, int); void swabinit(Device*); Off swabraddr(Device*); int swabread(Device *, Off, void*); @@ -246,45 +249,42 @@ void swabrecover(Device*); Devsize swabsize(Device*); Off swabsuper(Device*); +void swab(void*, int); int swabwrite(Device*, Off, void*); -void sync(char*); int syncblock(void); +void sync(char*); +void synccopy(void); long syscall(Ureg*); void sysinit(void); int tfmt(Fmt*); Timet time(void); -Timet nextime(Timet, int, int); Tlock* tlocked(Iobuf*, Dentry*); -void tsleep(Rendez*, int(*)(void*), void*, int); +int tokenize(char*, char**, int); void touser(void); Timet toytime(void); -Timet rtctime(void); -void setrtc(Timet); -void uidtostr(char*, int, int); +void tsleep(Rendez*, int(*)(void*), void*, int); Uid* uidpstr(char*); +void uidtostr(char*, int, int); void unlock(Lock*); void userinit(void(*)(void), void*, char*); void vecinit(void); +#define waitmsec(ms) tsleep(&u->tsleep, no, 0, ms) void wakeup(Rendez*); +int walkto(char*); void wbflush(void); void wlock(RWlock*); void wormcopy(void); void wormprobe(void); -void synccopy(void); -#define waitmsec(ms) tsleep(&u->tsleep, no, 0, ms) int wormread(Device*, Off, void*); +void wormsidestarts(Device *dev, int side, Sidestarts *stp); Devsize wormsize(Device*); Devsize wormsizeside(Device *, int side); -void wormsidestarts(Device *dev, int side, Sidestarts *stp); int wormwrite(Device*, Off, void*); void wreninit(Device*); int wrenread(Device*, Off, void*); Devsize wrensize(Device*); int wrenwrite(Device*, Off, void*); void wunlock(RWlock*); -void cmd_exec(char*); -void cmd_install(char*, char*, void (*)(int, char*[])); -ulong flag_install(char*, char*); int chartoea(uchar*, char*); int chartoip(uchar*, char*);