diff options
| author | Russ Cox <rsc@swtch.com> | 2007-10-29 14:33:17 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2007-10-29 14:33:17 -0400 |
| commit | 45ac814c8609174199cadb6f1bbb4baf7c12c94a (patch) | |
| tree | 49f4b2120a36b080a0ffe8f9988c21db7b97656c /src/cmd/venti/srv/fns.h | |
| parent | c5a183de108e5685305734d5cf984b58bb0d614a (diff) | |
| download | plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.tar.gz plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.tar.bz2 plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.zip | |
venti: fix sync deadlock, add /proc stub
Diffstat (limited to 'src/cmd/venti/srv/fns.h')
| -rw-r--r-- | src/cmd/venti/srv/fns.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/cmd/venti/srv/fns.h b/src/cmd/venti/srv/fns.h index 05a3e937..398562c2 100644 --- a/src/cmd/venti/srv/fns.h +++ b/src/cmd/venti/srv/fns.h @@ -29,7 +29,6 @@ void delaykickroundproc(void*); void dirtydblock(DBlock*, int); void diskaccess(int); void disksched(void); -AState diskstate(void); void *emalloc(ulong); void emptydcache(void); void emptyicache(void); @@ -60,6 +59,7 @@ vlong hargint(HConnect*, char*, vlong); int hdebug(HConnect*); int hdisk(HConnect*); int hnotfound(HConnect*); +int hproc(HConnect*); int hsethtml(HConnect*); int hsettext(HConnect*); int httpdinit(char *address, char *webroot); @@ -68,6 +68,7 @@ IEntry* icachedirty(u32int, u32int, u64int); ulong icachedirtyfrac(void); void icacheclean(IEntry*); int icachelookup(u8int *score, int type, IAddr *ia); +AState icachestate(void); int ientrycmp(const void *vie1, const void *vie2); char *ifileline(IFile *f); int ifilename(IFile *f, char *dst); @@ -91,7 +92,7 @@ Part* initpart(char *name, int mode); void initround(Round*, char*, int); int initventi(char *config, Config *conf); void insertlump(Lump *lump, Packet *p); -int insertscore(u8int *score, IAddr *ia, int state); +int insertscore(u8int *score, IAddr *ia, int state, AState *as); void kickdcache(void); void kickicache(void); void kickround(Round*, int wait); @@ -156,7 +157,6 @@ int runconfig(char *config, Config*); int scorecmp(u8int *, u8int *); void scoremem(u8int *score, u8int *buf, int size); void setatailstate(AState*); -void setdcachestate(AState*); void seterr(int severity, char *fmt, ...); void setstat(int, long); void settrace(char *type); @@ -170,9 +170,8 @@ int strscore(char *s, u8int *score); int stru32int(char *s, u32int *r); int stru64int(char *s, u64int *r); void sumarena(Arena *arena); -int syncarena(Arena *arena, u64int start, u32int n, int zok, int fix); -int syncarenaindex(Index *ix, Arena *arena, u32int clump, u64int a, int fix, int *pflush, int check); -int syncindex(Index *ix, int fix, int mustflushicache, int check); +int syncarena(Arena *arena, u32int n, int zok, int fix); +int syncindex(Index *ix); void trace(char *type, char*, ...); void traceinit(void); int u64log2(u64int v); @@ -201,12 +200,12 @@ void wbbloomhead(Bloom*); int wbisect(ISect *is); int wbindex(Index *ix); int whackblock(u8int *dst, u8int *src, int ssize); -u64int writeaclump(Arena *a, Clump *c, u8int *clbuf, u64int, u64int*); +u64int writeaclump(Arena *a, Clump *c, u8int *clbuf); u32int writearena(Arena *arena, u64int aa, u8int *clbuf, u32int n); int writebloom(Bloom*); int writeclumpinfo(Arena *arean, int clump, ClumpInfo *ci); int writepng(Hio*, Memimage*); -u64int writeiclump(Index *ix, Clump *c, u8int *clbuf, u64int*); +u64int writeiclump(Index *ix, Clump *c, u8int *clbuf); int writelump(Packet *p, u8int *score, int type, u32int creator, uint ms); int writepart(Part *part, u64int addr, u8int *buf, u32int n); int writeqlump(Lump *u, Packet *p, int creator, uint ms); |