4 files changed, 47 insertions(+), 3 deletions(-)

M port/devproc.c
M port/portdat.h
M port/portfns.h
M port/proc.c

@@ 18,6 18,7 @@ enum{
 	Qsegment,
 	Qstatus,
 	Qtext,
+	Qwait,
 };
 
 #define	STATSIZE	(2*NAMELEN+12+7*12)


@@ 31,6 32,7 @@ Dirtab procdir[] =
 	"segment",	{Qsegment},	0,			0444,
 	"status",	{Qstatus},	STATSIZE,		0444,
 	"text",		{Qtext},	0,			0000,
+	"wait",		{Qwait},	0,			0400,
 };
 
 /* Segment type from portdat.h */


@@ 157,8 159,6 @@ procopen(Chan *c, int omode)
 
 	switch(QID(c->qid)){
 	case Qtext:
-		if(omode != OREAD)
-			error(Eperm);
 		tc = proctext(c, p);
 		tc->offset = 0;
 		return tc;


@@ 169,6 169,7 @@ procopen(Chan *c, int omode)
 	case Qsegment:
 	case Qproc:
 	case Qstatus:
+	case Qwait:
 		break;
 
 	case Qnotepg:


@@ 243,6 244,7 @@ procread(Chan *c, void *va, long n, ulong offset)
 	long l;
 	User *up;
 	Segment *sg;
+	Waitq *wq;
 
 	if(c->qid.path & CHDIR)
 		return devdirread(c, a, n, 0, 0, procgen);


@@ 383,6 385,35 @@ procread(Chan *c, void *va, long n, ulong offset)
 			exhausted("segments");
 		memmove(a, &statbuf[offset], n);
 		return n;
+
+	case Qwait:
+		if(n < sizeof(Waitmsg))
+			error(Etoosmall);
+
+		if(!canqlock(&p->qwaitr))
+			error(Einuse);
+
+		if(waserror()) {
+			qunlock(&p->qwaitr);
+			nexterror();
+		}
+
+		lock(&p->exl);
+		while(p->waitq == 0) {
+			unlock(&p->exl);
+			sleep(&p->waitr, haswaitq, p);
+			lock(&p->exl);
+		}
+		wq = p->waitq;
+		p->waitq = wq->next;
+		p->nwait--;
+		unlock(&p->exl);
+
+		qunlock(&p->qwaitr);
+		poperror();
+		memmove(a, &wq->w, sizeof(Waitmsg));
+		free(wq);
+		return sizeof(Waitmsg);
 	}
 	error(Egreg);
 	return 0;		/* not reached */

@@ 576,6 576,7 @@ struct Proc
 	Waitq	*waitq;			/* Exited processes wait children */
 	int	nchild;			/* Number of living children */
 	int	nwait;			/* Number of uncollected wait records */
+	QLock	qwaitr;
 	Rendez	waitr;			/* Place to hang out in wait */
 	Proc	*parent;
 

@@ 83,6 83,7 @@ Block*		getq(Queue*);
 int		gets(IOQ*, void*, int);
 void		gotolabel(Label*);
 Block*		grabq(Queue*);
+int		haswaitq(void*);
 int		hwcursmove(int, int);
 int		hwcursset(uchar*, uchar*, int, int);
 long		ibrk(ulong, int);

@@ 590,7 590,7 @@ pexit(char *exitstr, int freemem)
 			p->waitq = wq;
 			p->nwait++;
 			unlock(&p->exl);
-	
+
 			wakeup(&p->waitr);
 		}
 		else {


@@ 652,6 652,14 @@ pwait(Waitmsg *w)
 
 	p = u->p;
 
+	if(!canqlock(&p->qwaitr))
+		error(Einuse);
+
+	if(waserror()) {
+		qunlock(&p->qwaitr);
+		nexterror();
+	}
+
 	lock(&p->exl);
 	if(p->nchild == 0 && p->waitq == 0) {
 		unlock(&p->exl);


@@ 667,6 675,9 @@ pwait(Waitmsg *w)
 	p->nwait--;
 	unlock(&p->exl);
 
+	qunlock(&p->qwaitr);
+	poperror();
+
 	if(w)
 		memmove(w, &wq->w, sizeof(Waitmsg));
 	cpid = atoi(wq->w.pid);