commit e1dc7e4511d4644060d4904dcae50808d966fff7 from: rsc date: Mon Dec 27 00:13:48 2004 UTC signal handling, add prototype for pthreadinit commit - 43db87f1fcb51065ef50beae9da8b6310ccf1cae commit + e1dc7e4511d4644060d4904dcae50808d966fff7 blob - 77f97a4fcfc3872fb22b3eb203c6269ff5ef265f blob + 8ca8f8f1edd17ec70f1b88783b68ebf6621fadb5 --- src/libthread/pthread.c +++ src/libthread/pthread.c @@ -101,7 +101,7 @@ _threadsetproc(Proc *p) } void -pthreadinit(void) +_pthreadinit(void) { pthread_key_create(&prockey, 0); } blob - 6989518101141831f71138faaca89295549e5872 blob + 9a42b9e82cce27908a23f1081464e74bf0b8629a --- src/libthread/thread.c +++ 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); @@ -501,6 +501,13 @@ threadmainstart(void *v) { USED(v); threadmain(threadargc, threadargv); +} + +extern Jmp *(*_notejmpbuf)(void); +static Jmp* +threadnotejmp(void) +{ + return &proc()->sigjmp; } int @@ -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; blob - 9f70b0e06a56c10cc72502a4812a1800c7330e61 blob + fb7e4c3bcb8f7bde2c94504066a1e62e579f71ea --- src/libthread/threadimpl.h +++ 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);