signal handling, add prototype for pthreadinit

3 files changed, 19 insertions, 4 deletions

diff --git a/src/libthread/pthread.c b/src/libthread/pthread.c
index 77f97a4f..8ca8f8f1 100644
--- a/src/libthread/pthread.c
+++ b/src/libthread/pthread.c
@@ -101,7 +101,7 @@ _threadsetproc(Proc *p)
 }
 
 void
-pthreadinit(void)
+_pthreadinit(void)
 {
 	pthread_key_create(&prockey, 0);
 }
diff --git a/src/libthread/thread.c b/src/libthread/thread.c
index 69895181..9a42b9e8 100644
--- a/src/libthread/thread.c
+++ b/src/libthread/thread.c
@@ -190,7 +190,7 @@ scheduler(void *v)
 
 	p = v;
 	setproc(p);
-	print("s %p %d\n", p, gettid());
+	// print("s %p %d\n", p, gettid());
 	p->tid = pthread_self();
 	pthread_detach(p->tid);
 	lock(&p->lock);
@@ -503,6 +503,13 @@ threadmainstart(void *v)
 	threadmain(threadargc, threadargv);
 }
 
+extern Jmp *(*_notejmpbuf)(void);
+static Jmp*
+threadnotejmp(void)
+{
+	return &proc()->sigjmp;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -524,8 +531,9 @@ main(int argc, char **argv)
 	_wunlock = threadwunlock;
 	_rsleep = threadrsleep;
 	_rwakeup = threadrwakeup;
+	_notejmpbuf = threadnotejmp;
 
-	pthreadinit();
+	_pthreadinit();
 	p = procalloc();
 	if(mainstacksize == 0)
 		mainstacksize = 65536;
diff --git a/src/libthread/threadimpl.h b/src/libthread/threadimpl.h
index 9f70b0e0..fb7e4c3b 100644
--- a/src/libthread/threadimpl.h
+++ b/src/libthread/threadimpl.h
@@ -4,6 +4,12 @@ typedef struct Context Context;
 typedef struct Proc Proc;
 typedef struct _Procrendez _Procrendez;
 
+typedef struct Jmp Jmp;
+struct Jmp
+{
+	p9jmp_buf b;
+};
+
 enum
 {
 	STACK = 8192
@@ -54,6 +60,7 @@ struct Proc
 	_Procrendez	runrend;
 	Context	schedcontext;
 	void		*udata;
+	Jmp		sigjmp;
 };
 
 extern Proc *xxx;
@@ -67,4 +74,4 @@ extern Proc *_threadproc(void);
 extern void _threadsetproc(Proc*);
 extern int _threadlock(Lock*, int, ulong);
 extern void _threadunlock(Lock*, ulong);
-
+extern void _pthreadinit(void);