aboutsummaryrefslogtreecommitdiffstats
path: root/src/thread.c
diff options
context:
space:
mode:
authorEli Zaretskii2016-12-10 11:42:48 +0200
committerEli Zaretskii2016-12-10 11:42:48 +0200
commit828b4560cd4a0d8cb9b7a7a3e20ff0c53ba86cfa (patch)
tree8cb0731a18edc5a9499fc61f6855378a277e4fd1 /src/thread.c
parentc364d62f89a499d22f06f63e81ec7819f51596fa (diff)
downloademacs-828b4560cd4a0d8cb9b7a7a3e20ff0c53ba86cfa.tar.gz
emacs-828b4560cd4a0d8cb9b7a7a3e20ff0c53ba86cfa.zip
Fix error messages in thread.c
* src/thread.c (lisp_mutex_unlock, Fcondition_wait) (Fcondition_notify, Fthread_join): Fix error messages.
Diffstat (limited to 'src/thread.c')
-rw-r--r--src/thread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/thread.c b/src/thread.c
index ee5b82da905..ae2ce3dc02b 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -144,7 +144,7 @@ static int
144lisp_mutex_unlock (lisp_mutex_t *mutex) 144lisp_mutex_unlock (lisp_mutex_t *mutex)
145{ 145{
146 if (mutex->owner != current_thread) 146 if (mutex->owner != current_thread)
147 error ("blah"); 147 error ("Cannot unlock mutex owned by another thread");
148 148
149 if (--mutex->count > 0) 149 if (--mutex->count > 0)
150 return 0; 150 return 0;
@@ -375,7 +375,7 @@ this thread. */)
375 375
376 mutex = XMUTEX (cvar->mutex); 376 mutex = XMUTEX (cvar->mutex);
377 if (!lisp_mutex_owned_p (&mutex->mutex)) 377 if (!lisp_mutex_owned_p (&mutex->mutex))
378 error ("fixme"); 378 error ("Condition variable's mutex is not held by current thread");
379 379
380 flush_stack_call_func (condition_wait_callback, cvar); 380 flush_stack_call_func (condition_wait_callback, cvar);
381 381
@@ -430,7 +430,7 @@ thread. */)
430 430
431 mutex = XMUTEX (cvar->mutex); 431 mutex = XMUTEX (cvar->mutex);
432 if (!lisp_mutex_owned_p (&mutex->mutex)) 432 if (!lisp_mutex_owned_p (&mutex->mutex))
433 error ("fixme"); 433 error ("Condition variable's mutex is not held by current thread");
434 434
435 args.cvar = cvar; 435 args.cvar = cvar;
436 args.all = !NILP (all); 436 args.all = !NILP (all);
@@ -855,7 +855,7 @@ It is an error for a thread to try to join itself. */)
855 tstate = XTHREAD (thread); 855 tstate = XTHREAD (thread);
856 856
857 if (tstate == current_thread) 857 if (tstate == current_thread)
858 error ("cannot join current thread"); 858 error ("Cannot join current thread");
859 859
860 if (thread_alive_p (tstate)) 860 if (thread_alive_p (tstate))
861 flush_stack_call_func (thread_join_callback, tstate); 861 flush_stack_call_func (thread_join_callback, tstate);