o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with plan 9

Browse source
This commit is contained in:
rsc 2007-04-21 19:43:09 +00:00
parent 35a80291f7
commit 6ce75e8dc0
5 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libventi/cache.c
View file

@ -158,20 +158,14 @@ cachecheck(VtCache *c)
else if(b->addr != NilBlock) else if(b->addr != NilBlock)
refed++; refed++;
} }
if(c->nheap + refed != c->nblock){
fprint(2, "cachecheck: nheap %d refed %d nblocks %d\n", c->nheap, refed, c->nblock);
/*vtcachedump(c); */
}
assert(c->nheap + refed == c->nblock); assert(c->nheap + refed == c->nblock);
refed = 0; refed = 0;
for(i = 0; i < c->nblock; i++){ for(i = 0; i < c->nblock; i++){
b = &c->block[i]; b = &c->block[i];
if(b->ref){ if(b->ref){
if(1)fprint(2, "a=%ud %V ref=%d pc=%#lux\n", b->addr, b->score, b->ref, (ulong)b->pc);
refed++; refed++;
} }
} }
if(refed > 0)fprint(2, "cachecheck: in used %d\n", refed);
} }
static int static int
@ -353,7 +347,7 @@ vtcacheallocblock(VtCache *c, int type)
qlock(&b->lk); qlock(&b->lk);
b->nlock = 1; b->nlock = 1;
b->pc = getcallerpc(&b); b->pc = getcallerpc(&c);
return b; return b;
} }

2
src/libventi/file.c
View file

@ -1041,7 +1041,7 @@ filewrite1(VtFile *f, void *data, long count, vlong offset)
vtfilegetentry(f, &e); vtfilegetentry(f, &e);
if(count < 0 || offset < 0){ if(count < 0 || offset < 0){
werrstr("bad offset or count"); werrstr("vtfilewrite: bad offset or count");
return -1; return -1;
} }

6
src/libventi/hangup.c
View file

@ -1,5 +1,7 @@
#include <u.h> #include <u.h>
#ifdef PLAN9PORT
#include <sys/socket.h> #include <sys/socket.h>
#endif
#include <libc.h> #include <libc.h>
#include <venti.h> #include <venti.h>
#include "queue.h" #include "queue.h"
@ -9,9 +11,11 @@ vthangup(VtConn *z)
{ {
qlock(&z->lk); qlock(&z->lk);
z->state = VtStateClosed; z->state = VtStateClosed;
/* try to make the read in vtsendproc fail */ #ifdef PLAN9PORT
/* try to make the read in vtrecvproc fail */
shutdown(SHUT_WR, z->infd); shutdown(SHUT_WR, z->infd);
shutdown(SHUT_WR, z->outfd); shutdown(SHUT_WR, z->outfd);
#endif
if(z->infd >= 0) if(z->infd >= 0)
close(z->infd); close(z->infd);
if(z->outfd >= 0 && z->outfd != z->infd) if(z->outfd >= 0 && z->outfd != z->infd)

1
src/libventi/log.c
View file

@ -50,7 +50,6 @@ vtlognames(int *pn)
a = (char*)(s+nname); a = (char*)(s+nname);
e = (char*)s+nname*sizeof(char*)+size; e = (char*)s+nname*sizeof(char*)+size;
size = 0;
nname = 0; nname = 0;
for(i=0; i<nelem(vl.hash); i++) for(i=0; i<nelem(vl.hash); i++)
for(l=vl.hash[i]; l; l=l->next){ for(l=vl.hash[i]; l; l=l->next){

12
src/libventi/packet.c
View file

@ -75,7 +75,7 @@ static char EPacketSize[] = "bad packet size";
static char EPacketOffset[] = "bad packet offset"; static char EPacketOffset[] = "bad packet offset";
static char EBadSize[] = "bad size"; static char EBadSize[] = "bad size";
#if 0 #ifdef NOTDEF
static void checkpacket(Packet*); static void checkpacket(Packet*);
#endif #endif
@ -126,8 +126,6 @@ packetalloc(void)
p->next = nil; p->next = nil;
p->pc = getcallerpc((char*)&p+8); /* might not work, but fine */ p->pc = getcallerpc((char*)&p+8); /* might not work, but fine */
/*if(0)fprint(2, "packetalloc %p from %08lux %08lux %08lux\n", p, *((uint*)&p+2), *((uint*)&p+3), *((uint*)&p+4)); */
NOTFREE(p); NOTFREE(p);
return p; return p;
} }
@ -137,8 +135,6 @@ packetfree(Packet *p)
{ {
Frag *f, *ff; Frag *f, *ff;
/*if(1)fprint(2, "packetfree %p from %08lux\n", p, getcallerpc(&p)); */
if(p == nil) if(p == nil)
return; return;
@ -216,7 +212,6 @@ packetsplit(Packet *p, int n)
Packet *pp; Packet *pp;
Frag *f, *ff; Frag *f, *ff;
if(0) fprint(2, "packetsplit %p %d\n", p, n);
NOTFREE(p); NOTFREE(p);
if(n < 0 || n > p->size) { if(n < 0 || n > p->size) {
werrstr(EPacketSize); werrstr(EPacketSize);
@ -265,7 +260,6 @@ packetsplit(Packet *p, int n)
int int
packetconsume(Packet *p, uchar *buf, int n) packetconsume(Packet *p, uchar *buf, int n)
{ {
if(0) fprint(2, "packetconsume %p %d\n", p, n);
NOTFREE(p); NOTFREE(p);
if(buf && packetcopy(p, buf, 0, n) < 0) if(buf && packetcopy(p, buf, 0, n) < 0)
return -1; return -1;
@ -277,7 +271,6 @@ packettrim(Packet *p, int offset, int n)
{ {
Frag *f, *ff; Frag *f, *ff;
if(0) fprint(2, "packettrim %p %d %d\n", p, offset, n);
NOTFREE(p); NOTFREE(p);
if(offset < 0 || offset > p->size) { if(offset < 0 || offset > p->size) {
werrstr(EPacketOffset); werrstr(EPacketOffset);
@ -377,7 +370,6 @@ packettrailer(Packet *p, int n)
Mem *m; Mem *m;
Frag *f; Frag *f;
if(0) fprint(2, "packettrailer %p %d\n", p, n);
NOTFREE(p); NOTFREE(p);
if(n <= 0 || n > MaxFragSize) { if(n <= 0 || n > MaxFragSize) {
werrstr(EPacketSize); werrstr(EPacketSize);
@ -1009,7 +1001,7 @@ memtail(Mem *m, uchar *wp, int n)
return 0; return 0;
} }
#if 0 #ifdef NOTDEF
static void static void
checkpacket(Packet *p) checkpacket(Packet *p)
{ {