From d93cc14ecee8fbb0dc0fc746713aba7ee0979c4c Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Mon, 12 Jun 2006 17:20:42 +0000
Subject: fix proc leak; add p9usepwlibrary

---
 src/libthread/Linux.c  | 2 +-
 src/libthread/thread.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/libthread')

diff --git a/src/libthread/Linux.c b/src/libthread/Linux.c
index 683ddd12..17e8c12b 100644
--- a/src/libthread/Linux.c
+++ b/src/libthread/Linux.c
@@ -378,7 +378,7 @@ myperproc(void)
 			break;
 		}
 	}
-	fprint(2, "myperproc %d: cannot find self\n", pid);
+	fprint(2, "myperproc %d (%s): cannot find self\n", pid, argv0);
 	abort();
 	return nil;
 }
diff --git a/src/libthread/thread.c b/src/libthread/thread.c
index ff748acc..acd56fa2 100644
--- a/src/libthread/thread.c
+++ b/src/libthread/thread.c
@@ -39,6 +39,11 @@ _threaddebug(char *fmt, ...)
 		snprint(buf, sizeof buf, "/tmp/%s.tlog", p);
 		if((fd = create(buf, OWRITE, 0666)) < 0)
 			fd = open("/dev/null", OWRITE);
+		if(fd >= 0 && fd != 2){
+			dup(fd, 2);
+			close(fd);
+			fd = 2;
+		}
 	}
 
 	va_start(arg, fmt);
@@ -331,6 +336,7 @@ Out:
 		threadexitsall(p->msg);
 	unlock(&threadnproclock);
 	unlock(&p->lock);
+	_threadsetproc(nil);
 	free(p);
 }
 
@@ -599,7 +605,7 @@ threadrwakeup(Rendez *r, int all, ulong pc)
 static int threadargc;
 static char **threadargv;
 int mainstacksize;
-
+extern int _p9usepwlibrary;	/* getgrgid etc. smash the stack - tell _p9dir just say no */
 static void
 threadmainstart(void *v)
 {
@@ -613,6 +619,7 @@ threadmainstart(void *v)
 	 * This means the pthread implementation is not suitable for
 	 * running under libthread.  Time to write your own.  Sorry.
 	 */
+	_p9usepwlibrary = 0;
 	threadmainproc = proc();
 	threadmain(threadargc, threadargv);
 }
-- 
cgit v1.2.3