projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ru.po from igor, intl tweaks, picon fixes for last chkin, snap motion event on btns
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
thread.C
diff --git
a/cinelerra-5.1/guicast/thread.C
b/cinelerra-5.1/guicast/thread.C
index 6cde612dfdfbb853902f02e423bc39699817bf18..26ccf9a45918ce78b7147c4dc7bb6829b136da18 100644
(file)
--- a/
cinelerra-5.1/guicast/thread.C
+++ b/
cinelerra-5.1/guicast/thread.C
@@
-127,9
+127,14
@@
int Thread::join() // join this thread
{
if( !exists() ) return 0;
if( synchronous ) {
{
if( !exists() ) return 0;
if( synchronous ) {
-// NOTE: this does not do anything if the thread is not synchronous
+// NOTE: this fails if the thread is not synchronous or
+// or another thread is already waiting to join.
int ret = pthread_join(tid, 0);
int ret = pthread_join(tid, 0);
- if( ret ) strerror(ret);
+ if( ret ) {
+ fflush(stdout);
+ fprintf(stderr, "Thread %p: %s\n", (void*)tid, strerror(ret));
+ fflush(stderr);
+ }
CLEAR_LOCKS_TID(tid);
TheList::dbg_del(tid);
tid = ((pthread_t)-1);
CLEAR_LOCKS_TID(tid);
TheList::dbg_del(tid);
tid = ((pthread_t)-1);