From 571532605bc0db221c76e36067435e4355e0d1a1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 18 Jan 2017 18:00:16 +0200 Subject: Rudimentary error handling for non-main threads * src/thread.c (last_thread_error): New static variable. (syms_of_threads): Staticpro it. (record_thread_error, Fthread_last_error): New functions. (syms_of_threads): Defsubr Fthread_last_error. * doc/lispref/threads.texi (Basic Thread Functions): Document thread-last-error. * test/src/thread-tests.el (thread-errors, thread-signal-early) (threads-condvar-wait): Test the values returned by thread-last-error. --- test/src/thread-tests.el | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'test/src/thread-tests.el') diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el index df8222a21aa..849b2e3dd1b 100644 --- a/test/src/thread-tests.el +++ b/test/src/thread-tests.el @@ -222,8 +222,15 @@ (ert-deftest thread-errors () "Test what happens when a thread signals an error." - (should (threadp (make-thread #'call-error "call-error"))) - (should (threadp (make-thread #'thread-custom "thread-custom")))) + (let (th1 th2) + (setq th1 (make-thread #'call-error "call-error")) + (should (threadp th1)) + (while (thread-alive-p th1) + (thread-yield)) + (should (equal (thread-last-error) + '(error "Error is called"))) + (setq th2 (make-thread #'thread-custom "thread-custom")) + (should (threadp th2)))) (ert-deftest thread-sticky-point () "Test bug #25165 with point movement in cloned buffer." @@ -242,7 +249,8 @@ (while t (thread-yield)))))) (thread-signal thread 'error nil) (sit-for 1) - (should-not (thread-alive-p thread)))) + (should-not (thread-alive-p thread)) + (should (equal (thread-last-error) '(error))))) (defvar threads-condvar nil) @@ -287,6 +295,7 @@ (thread-signal new-thread 'error '("Die, die, die!")) (sleep-for 0.1) ;; Make sure the thread died. - (should (= (length (all-threads)) 1)))) + (should (= (length (all-threads)) 1)) + (should (equal (thread-last-error) '(error "Die, die, die!"))))) ;;; threads.el ends here -- cgit v1.2.3