Date: Sat, 8 Feb 2014 16:00:00 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: freebsd-threads@FreeBSD.org Subject: Re: threads/186309: commit references a PR Message-ID: <201402081600.s18G00OC017341@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR threads/186309; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: threads/186309: commit references a PR Date: Sat, 8 Feb 2014 15:51:54 +0000 (UTC) Author: kib Date: Sat Feb 8 15:51:42 2014 New Revision: 261637 URL: http://svnweb.freebsd.org/changeset/base/261637 Log: MFC r261354: In _pthread_kill(), if passed pthread is current thread, do not send the signal second time, by adding the missed else before if statement. PR: threads/186309 Modified: stable/9/lib/libthr/thread/thr_kill.c Directory Properties: stable/9/lib/libthr/ (props changed) Modified: stable/9/lib/libthr/thread/thr_kill.c ============================================================================== --- stable/9/lib/libthr/thread/thr_kill.c Sat Feb 8 15:51:24 2014 (r261636) +++ stable/9/lib/libthr/thread/thr_kill.c Sat Feb 8 15:51:42 2014 (r261637) @@ -42,24 +42,27 @@ __weak_reference(_pthread_kill, pthread_ int _pthread_kill(pthread_t pthread, int sig) { - struct pthread *curthread = _get_curthread(); + struct pthread *curthread; int ret; /* Check for invalid signal numbers: */ if (sig < 0 || sig > _SIG_MAXSIG) /* Invalid signal: */ - ret = EINVAL; + return (EINVAL); + + curthread = _get_curthread(); + /* * Ensure the thread is in the list of active threads, and the * signal is valid (signal 0 specifies error checking only) and * not being ignored: */ - else if (curthread == pthread) { + if (curthread == pthread) { if (sig > 0) _thr_send_sig(pthread, sig); ret = 0; - } if ((ret = _thr_find_thread(curthread, pthread, /*include dead*/0)) - == 0) { + } else if ((ret = _thr_find_thread(curthread, pthread, + /*include dead*/0)) == 0) { if (sig > 0) _thr_send_sig(pthread, sig); THR_THREAD_UNLOCK(curthread, pthread); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402081600.s18G00OC017341>