commit - baef953da253314657be9adea8f371bfbf4ba09e
commit + 162d0d5cd94fabab822ac66655be8957151cef99
blob - 5e022f0b145c452fe684d23bc1c73f012bcb096b
blob + 35f6ffe394bd333b9e77f6d7953aa6afcf1734fc
--- src/libthread/pthread.c
+++ src/libthread/pthread.c
abort();
}
+/* note: _procsleep can have spurious wakeups, like pthread_cond_wait */
void
_procsleep(_Procrendez *r)
{
/* r is protected by r->l, which we hold */
pthread_cond_init(&r->cond, 0);
r->asleep = 1;
- pthread_cond_wait(&r->cond, &r->l->mutex);
+ if(pthread_cond_wait(&r->cond, &r->l->mutex) != 0)
+ sysfatal("pthread_cond_wait: %r");
pthread_cond_destroy(&r->cond);
r->asleep = 0;
}
blob - f579b5675b47fcfb2596039ace5318e47b8c8129
blob + 902942d9afcb69204dc32545c3524a28eb424f9a
--- src/libthread/thread.c
+++ src/libthread/thread.c
va_end(arg);
t = proc()->thread;
if(t)
- fprint(fd, "%d.%d: %s\n", getpid(), t->id, buf);
+ fprint(fd, "%p %d.%d: %s\n", proc(), getpid(), t->id, buf);
else
- fprint(fd, "%d._: %s\n", getpid(), buf);
+ fprint(fd, "%p %d._: %s\n", proc(), getpid(), buf);
}
static _Thread*
static void
procswitch(Proc *p, _Thread *from, _Thread *to)
{
-// fprint(2, "procswitch %p %d %d\n", p, from?from->id:-1, to?to->id:-1);
+ _threaddebug("procswitch %p %d %d", p, from?from->id:-1, to?to->id:-1);
lock(&p->schedlock);
from->schedrend.l = &p->schedlock;
if(to) {
p->schedthread = to;
to->schedrend.l = &p->schedlock;
+ _threaddebug("procswitch wakeup %p %d", p, to->id);
_procwakeup(&to->schedrend);
}
if(p->schedthread != from) {
if(from->exiting) {
unlock(&p->schedlock);
_threadpexit();
+ _threaddebug("procswitch exit wakeup!!!\n");
}
- _procsleep(&from->schedrend);
+ while(p->schedthread != from) {
+ _threaddebug("procswitch sleep %p %d", p, from->id);
+ _procsleep(&from->schedrend);
+ _threaddebug("procswitch awake %p %d", p, from->id);
+ }
+ if(p->schedthread != from)
+ sysfatal("_procswitch %p %p oops", p->schedthread, from);
}
unlock(&p->schedlock);
}
procswitch(p, p->thread0, t);
else
contextswitch(&p->schedcontext, &t->context);
+ _threaddebug("back in scheduler");
/*print("back in scheduler\n"); */
goto Top;
}
if(l->owner == nil){
l->owner = (*threadnow)();
/*print("qlock %p @%#x by %p\n", l, pc, l->owner); */
+ if(l->owner == nil) {
+ fprint(2, "%s: qlock uncontended owner=nil oops\n", argv0);
+ abort();
+ }
unlock(&l->l);
return 1;
}
argv0, pc, l->owner, (*threadnow)());
abort();
}
+ if(l->owner == nil) {
+ fprint(2, "%s: qlock threadswitch owner=nil oops\n", argv0);
+ abort();
+ }
+
/*print("qlock wakeup %p @%#x by %p\n", l, pc, (*threadnow)()); */
return 1;
}
// Easier to just run in pthread-per-thread mode.
pthreadperthread = 1;
#endif
- if(strstr(opts, "nodaemon") || getenv("NOLIBTHREADDAEMONIZE") == nil)
+ if(strstr(opts, "nodaemon") == nil && getenv("NOLIBTHREADDAEMONIZE") == nil)
_threadsetupdaemonize();
threadargc = argc;